Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | document submodule sync --recursivesb/doc-submodule-sync-recursive | Stefan Beller | 2015-12-04 | 1 | -1/+4 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'nd/doc-check-ref-format-typo' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typo | Nguyễn Thái Ngọc Duy | 2015-12-04 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array' into maint | Junio C Hamano | 2015-12-11 | 1 | -16/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-array | René Scharfe | 2015-11-01 | 1 | -16/+8 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rs/pop-commit' into maint | Junio C Hamano | 2015-12-11 | 10 | -92/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commit | René Scharfe | 2015-10-26 | 10 | -92/+31 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'as/subtree-with-spaces' into maint | Junio C Hamano | 2015-12-11 | 2 | -74/+124 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spaces | Alexey Shumkin | 2015-09-08 | 2 | -1/+48 | |
| * | | | | | | | | | | | t7900-subtree: test the "space in a subdirectory name" case | Alexey Shumkin | 2015-09-08 | 2 | -73/+76 | |
* | | | | | | | | | | | | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint | Junio C Hamano | 2015-12-11 | 4 | -16/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | test-lib-functions: detect test_when_finished in subshelljk/test-lint-forbid-when-finished-in-subshell | John Keeping | 2015-09-08 | 1 | -0/+5 | |
| * | | | | | | | | | | | t7800: don't use test_config in a subshell | John Keeping | 2015-09-08 | 1 | -4/+4 | |
| * | | | | | | | | | | | test-lib-functions: support "test_config -C <dir> ..." | John Keeping | 2015-09-08 | 1 | -3/+17 | |
| * | | | | | | | | | | | t5801: don't use test_when_finished in a subshell | John Keeping | 2015-09-08 | 1 | -8/+4 | |
| * | | | | | | | | | | | t7610: don't use test_config in a subshell | John Keeping | 2015-09-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | Documentation/git-update-index: add missing opts to synopsis | Christian Couder | 2015-12-10 | 1 | -0/+1 | |
* | | | | | | | | | | | | Git 2.6.4v2.6.4 | Junio C Hamano | 2015-12-08 | 3 | -2/+18 | |
* | | | | | | | | | | | | Merge branch 'rs/status-detached-head-memcmp' into maint | Junio C Hamano | 2015-12-08 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmp | René Scharfe | 2015-11-28 | 1 | -5/+4 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ad/sha1-update-chunked' into maint | Junio C Hamano | 2015-12-08 | 7 | -13/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunked | Atousa Pahlevan Duprat | 2015-11-05 | 5 | -0/+44 | |
| * | | | | | | | | | | | | sha1: provide another level of indirection for the SHA-1 functions | Atousa Pahlevan Duprat | 2015-11-05 | 3 | -13/+25 | |
* | | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' into maint | Junio C Hamano | 2015-12-08 | 2 | -7/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphan | SZEDER Gábor | 2015-11-24 | 2 | -5/+4 | |
| * | | | | | | | | | | | | | bash prompt: remove a redundant 'git diff' option | SZEDER Gábor | 2015-11-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branch | SZEDER Gábor | 2015-11-24 | 1 | -3/+28 | |
* | | | | | | | | | | | | | | Merge branch 'jk/interpret-trailers-outside-a-repository' into maint | Junio C Hamano | 2015-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | interpret-trailers: allow running outside a repositoryjk/interpret-trailers-outside-a-repository | John Keeping | 2015-09-08 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/rebase-no-autostash' into maint | Junio C Hamano | 2015-12-08 | 3 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostash | John Keeping | 2015-09-10 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | rebase: support --no-autostash | John Keeping | 2015-09-10 | 2 | -1/+14 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Prepare for 2.6.4 | Junio C Hamano | 2015-12-04 | 2 | -1/+49 | |
* | | | | | | | | | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2015-12-04 | 2 | -3/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_file | David Aguilar | 2015-10-29 | 2 | -3/+20 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 | 6 | -22/+78 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-pack | Doug Kelly | 2015-11-04 | 2 | -1/+22 | |
| * | | | | | | | | | | | | | t5304: test cleaning pack garbage | Doug Kelly | 2015-11-04 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directory | Junio C Hamano | 2015-08-17 | 4 | -22/+36 | |
* | | | | | | | | | | | | | | Merge branch 'eg/p4-submit-catch-failure' into maint | Jeff King | 2015-12-01 | 2 | -35/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failure | GIRARD Etienne | 2015-11-24 | 2 | -35/+38 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'dk/check-ignore-docs' into maint | Jeff King | 2015-12-01 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | check-ignore: correct documentation about outputdk/check-ignore-docs | Dennis Kaarsemaker | 2015-11-24 | 1 | -5/+5 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'ld/p4-detached-head' into maint | Jeff King | 2015-12-01 | 2 | -9/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-p4: work with a detached headld/p4-detached-head | Luke Diamand | 2015-11-24 | 2 | -8/+17 | |
| * | | | | | | | | | | | | | | git-p4: add option to system() to return subshell status | Luke Diamand | 2015-11-24 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | git-p4: add failing test for submit from detached head | Luke Diamand | 2015-11-24 | 1 | -0/+16 | |
* | | | | | | | | | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maint | Jeff King | 2015-12-01 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguity | SZEDER Gábor | 2015-11-24 | 2 | -1/+8 | |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |