aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'pw/git-p4'Junio C Hamano2012-04-23
|\
| * git p4: use "git p4" directly in testsPete Wyckoff2012-04-09
| * git p4: update name in scriptPete Wyckoff2012-04-09
| * git-p4: move to toplevelPete Wyckoff2012-04-09
* | Merge branch 'ms/remote-usage-string'Junio C Hamano2012-04-23
|\ \
| * | remote: update builtin usageMichael Schubert2012-04-09
* | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-23
|\ \ \
| * | | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-09
* | | | RelNotes: the third batchJunio C Hamano2012-04-20
* | | | Merge branch 'js/spawn-via-shell-path-fix'Junio C Hamano2012-04-20
|\ \ \ \
| * | | | Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsJohannes Sixt2012-04-17
* | | | | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-20
|\ \ \ \ \
| * | | | | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-12
| * | | | | clean up struct ref's nonfastforward fieldJeff King2012-03-26
| * | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-19
* | | | | | Merge branch 'bw/submodule-sed-solaris'Junio C Hamano2012-04-20
|\ \ \ \ \ \
| * | | | | | Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton2012-04-09
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/run-command-eacces'Junio C Hamano2012-04-20
|\ \ \ \ \ \
| * | | | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-05
| * | | | | | compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2012-04-05
* | | | | | | Merge branch 'jc/push-upstream-sanity'Junio C Hamano2012-04-20
|\ \ \ \ \ \ \
| * | | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-05
* | | | | | | | Merge branch 'jc/am-report-3way'Junio C Hamano2012-04-20
|\ \ \ \ \ \ \ \
| * | | | | | | | am -3: list the paths that needed 3-way fallbackJunio C Hamano2012-03-28
* | | | | | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am: support --include optionJohannes Berg2012-03-28
* | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesJunio C Hamano2012-03-13
* | | | | | | | | | | RelNotes: the second batch of topics graduated to 'master'Junio C Hamano2012-04-16
* | | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-05
* | | | | | | | | | | | Merge branch 'jc/commit-unedited-template'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano2012-04-03
| * | | | | | | | | | | | git-commit.txt: clarify -t requires editing messageAdam Monsen2012-04-01
| * | | | | | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-30
| * | | | | | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-30
| * | | | | | | | | | | | t7501: test the right kind of breakageJunio C Hamano2012-03-30
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/spawn-via-shell-path'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Use SHELL_PATH from build system in run_command.c:prepare_shell_cmdBen Walton2012-04-03
* | | | | | | | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: add If-Modified-Since handling to git_snapshot().W. Trevor King2012-03-30
| * | | | | | | | | | | | gitweb: refactor If-Modified-Since handlingW. Trevor King2012-03-30
| * | | | | | | | | | | | gitweb: add `status` headers to git_feed() responses.W. Trevor King2012-03-30
* | | | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-30
* | | | | | | | | | | | | | Merge branch 'sl/autoconf'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | configure: be more idiomaticStefano Lattarini2012-03-26
| * | | | | | | | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}defStefano Lattarini2012-03-26
| * | | | | | | | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocationStefano Lattarini2012-03-26
* | | | | | | | | | | | | | | Merge branch 'jk/branch-quiet'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \