Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jb/am-include' | Junio C Hamano | 2012-04-20 | 2 | -2/+4 |
|\ | |||||
| * | am: support --include option | Johannes Berg | 2012-03-28 | 2 | -2/+4 |
* | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-04-20 | 2 | -7/+134 |
|\ \ | |||||
| * | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-people | Junio C Hamano | 2012-03-13 | 2 | -7/+134 |
* | | | RelNotes: the second batch of topics graduated to 'master' | Junio C Hamano | 2012-04-16 | 1 | -0/+41 |
* | | | Merge branch 'jk/add-p-skip-conflicts' | Junio C Hamano | 2012-04-16 | 2 | -7/+44 |
|\ \ \ | |||||
| * | | | add--interactive: ignore unmerged entries in patch mode | Jeff King | 2012-04-05 | 2 | -7/+44 |
* | | | | Merge branch 'jc/commit-unedited-template' | Junio C Hamano | 2012-04-16 | 3 | -24/+65 |
|\ \ \ \ | |||||
| * | | | | Documentation/git-commit: rephrase the "initial-ness" of templates | Junio C Hamano | 2012-04-03 | 1 | -5/+8 |
| * | | | | git-commit.txt: clarify -t requires editing message | Adam Monsen | 2012-04-01 | 1 | -5/+5 |
| * | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 | 2 | -19/+47 |
| * | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 | 2 | -0/+8 |
| * | | | | t7501: test the right kind of breakage | Junio C Hamano | 2012-03-30 | 1 | -0/+2 |
* | | | | | Merge branch 'bw/spawn-via-shell-path' | Junio C Hamano | 2012-04-16 | 2 | -1/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd | Ben Walton | 2012-04-03 | 2 | -1/+12 |
* | | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since' | Junio C Hamano | 2012-04-16 | 2 | -27/+98 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: add If-Modified-Since handling to git_snapshot(). | W. Trevor King | 2012-03-30 | 2 | -0/+43 |
| * | | | | | | gitweb: refactor If-Modified-Since handling | W. Trevor King | 2012-03-30 | 2 | -29/+55 |
| * | | | | | | gitweb: add `status` headers to git_feed() responses. | W. Trevor King | 2012-03-30 | 1 | -2/+4 |
* | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' | Junio C Hamano | 2012-04-16 | 3 | -13/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 | 3 | -13/+37 |
* | | | | | | | | Merge branch 'sl/autoconf' | Junio C Hamano | 2012-04-16 | 1 | -98/+99 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | configure: be more idiomaticsl/autoconf | Stefano Lattarini | 2012-03-26 | 1 | -89/+87 |
| * | | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}def | Stefano Lattarini | 2012-03-26 | 1 | -12/+14 |
| * | | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocation | Stefano Lattarini | 2012-03-26 | 1 | -12/+13 |
* | | | | | | | | | Merge branch 'jk/branch-quiet' | Junio C Hamano | 2012-04-16 | 5 | -11/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | teach "git branch" a --quiet optionjk/branch-quiet | Jeff King | 2012-03-26 | 2 | -6/+15 |
| * | | | | | | | | | checkout: suppress tracking message with "-q" | Jeff King | 2012-03-26 | 4 | -6/+8 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' | Junio C Hamano | 2012-04-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginning | René Scharfe | 2012-03-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 9 | -14/+45 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-empty | Jeff King | 2012-03-23 | 2 | -0/+17 |
| * | | | | | | | | | | teach diffcore-rename to optionally ignore empty content | Jeff King | 2012-03-23 | 3 | -1/+12 |
| * | | | | | | | | | | make is_empty_blob_sha1 available everywhere | Jeff King | 2012-03-23 | 2 | -10/+13 |
| * | | | | | | | | | | drop casts from users EMPTY_TREE_SHA1_BIN | Jeff King | 2012-03-23 | 3 | -3/+3 |
* | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' | Junio C Hamano | 2012-04-16 | 2 | -11/+43 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdir | Junio C Hamano | 2012-03-15 | 2 | -11/+43 |
* | | | | | | | | | | | | Merge branch 'rs/unpack-trees-leakfix' | Junio C Hamano | 2012-04-16 | 1 | -10/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | unpack-trees: plug minor memory leak | René Scharfe | 2012-04-10 | 1 | -9/+16 |
| * | | | | | | | | | | | | unpack-trees: don't perform any index operation if we're not merging | René Scharfe | 2012-04-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'nl/rebase-i-cheat-sheet' | Junio C Hamano | 2012-04-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheet | Junio C Hamano | 2012-03-20 | 1 | -0/+2 |
* | | | | | | | | | | | | | | RelNotes: the first batch of topics graduated to 'master' | Junio C Hamano | 2012-04-15 | 1 | -0/+19 |
* | | | | | | | | | | | | | | Merge branch 'da/difftool-test' | Junio C Hamano | 2012-04-15 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t7800: Test difftool passing arguments to diffda/difftool-test | David Aguilar | 2012-03-19 | 1 | -0/+11 |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'zj/test-cred-helper-nicer-prove' | Junio C Hamano | 2012-04-15 | 1 | -24/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-prove | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -1/+29 |
| * | | | | | | | | | | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -23/+16 |
* | | | | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' | Junio C Hamano | 2012-04-15 | 4 | -32/+73 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree | Johan Herland | 2012-03-15 | 2 | -8/+13 |