summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jb/am-include'Junio C Hamano2012-04-202-2/+4
|\
| * am: support --include optionJohannes Berg2012-03-282-2/+4
* | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-202-7/+134
|\ \
| * | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-132-7/+134
* | | RelNotes: the second batch of topics graduated to 'master'Junio C Hamano2012-04-161-0/+41
* | | Merge branch 'jk/add-p-skip-conflicts'Junio C Hamano2012-04-162-7/+44
|\ \ \
| * | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-052-7/+44
* | | | Merge branch 'jc/commit-unedited-template'Junio C Hamano2012-04-163-24/+65
|\ \ \ \
| * | | | Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano2012-04-031-5/+8
| * | | | git-commit.txt: clarify -t requires editing messageAdam Monsen2012-04-011-5/+5
| * | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-302-19/+47
| * | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-302-0/+8
| * | | | t7501: test the right kind of breakageJunio C Hamano2012-03-301-0/+2
* | | | | Merge branch 'bw/spawn-via-shell-path'Junio C Hamano2012-04-162-1/+12
|\ \ \ \ \
| * | | | | Use SHELL_PATH from build system in run_command.c:prepare_shell_cmdBen Walton2012-04-032-1/+12
* | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Junio C Hamano2012-04-162-27/+98
|\ \ \ \ \ \
| * | | | | | gitweb: add If-Modified-Since handling to git_snapshot().W. Trevor King2012-03-302-0/+43
| * | | | | | gitweb: refactor If-Modified-Since handlingW. Trevor King2012-03-302-29/+55
| * | | | | | gitweb: add `status` headers to git_feed() responses.W. Trevor King2012-03-301-2/+4
* | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env'Junio C Hamano2012-04-163-13/+37
|\ \ \ \ \ \ \
| * | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-303-13/+37
* | | | | | | | Merge branch 'sl/autoconf'Junio C Hamano2012-04-161-98/+99
|\ \ \ \ \ \ \ \
| * | | | | | | | configure: be more idiomaticsl/autoconfStefano Lattarini2012-03-261-89/+87
| * | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}defStefano Lattarini2012-03-261-12/+14
| * | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocationStefano Lattarini2012-03-261-12/+13
* | | | | | | | | Merge branch 'jk/branch-quiet'Junio C Hamano2012-04-165-11/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | teach "git branch" a --quiet optionjk/branch-quietJeff King2012-03-262-6/+15
| * | | | | | | | | checkout: suppress tracking message with "-q"Jeff King2012-03-264-6/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano2012-04-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginningRené Scharfe2012-03-251-1/+1
* | | | | | | | | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-169-14/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-232-0/+17
| * | | | | | | | | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-233-1/+12
| * | | | | | | | | | make is_empty_blob_sha1 available everywhereJeff King2012-03-232-10/+13
| * | | | | | | | | | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-233-3/+3
* | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Junio C Hamano2012-04-162-11/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-152-11/+43
* | | | | | | | | | | | Merge branch 'rs/unpack-trees-leakfix'Junio C Hamano2012-04-161-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | unpack-trees: plug minor memory leakRené Scharfe2012-04-101-9/+16
| * | | | | | | | | | | | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-101-1/+1
* | | | | | | | | | | | | Merge branch 'nl/rebase-i-cheat-sheet'Junio C Hamano2012-04-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheetJunio C Hamano2012-03-201-0/+2
* | | | | | | | | | | | | | RelNotes: the first batch of topics graduated to 'master'Junio C Hamano2012-04-151-0/+19
* | | | | | | | | | | | | | Merge branch 'da/difftool-test'Junio C Hamano2012-04-151-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t7800: Test difftool passing arguments to diffda/difftool-testDavid Aguilar2012-03-191-0/+11
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'zj/test-cred-helper-nicer-prove'Junio C Hamano2012-04-151-24/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-proveZbigniew Jędrzejewski-Szmek2012-03-151-1/+29
| * | | | | | | | | | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPERZbigniew Jędrzejewski-Szmek2012-03-151-23/+16
* | | | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree'Junio C Hamano2012-04-154-32/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-152-8/+13