Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | 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 | |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'mg/doc-word-diff-example' into maint | Jeff King | 2015-12-01 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-example | Michael J Gruber | 2015-11-24 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'cb/ssl-config-pathnames' into maint | Jeff King | 2015-12-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | http: treat config options sslCAPath and sslCAInfo as pathscb/ssl-config-pathnames | Charles Bailey | 2015-11-24 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'dk/t5813-unc-paths' into maint | Jeff King | 2015-12-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t5813: avoid creating urls that break on cygwindk/t5813-unc-paths | Dennis Kaarsemaker | 2015-11-20 | 1 | -2/+2 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'dk/rerere-train-quoting' into maint | Jeff King | 2015-12-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quoting | Daniel Knittl-Frank | 2015-11-20 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'cb/hook-sigpipe' into maint | Jeff King | 2015-12-01 | 3 | -20/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipe | Clemens Buchacher | 2015-11-16 | 3 | -20/+27 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'fm/shell-path-whitespace' into maint | Jeff King | 2015-12-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespace | Fredrik Medley | 2015-11-13 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'ar/doc-env-variable-format' into maint | Jeff King | 2015-12-01 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Documentation: make environment variable formatting more consistentar/doc-env-variable-format | Андрей Рыбак | 2015-11-11 | 1 | -6/+6 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'pt/http-socks-proxy' into maint | Jeff King | 2015-12-01 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | remote-http(s): support SOCKS proxiespt/http-socks-proxy | Pat Thoyts | 2015-11-20 | 1 | -0/+11 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint | Jeff King | 2015-12-01 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | configure.ac: use $LIBS not $CFLAGS when testing -lpthreadrc/configure-use-libs-when-checking-a-lib | Rainer M. Canavan | 2015-11-06 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | Documentation/git-update-index: add missing opts to synopsys | Christian Couder | 2015-11-24 | 1 | -0/+1 | |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Git 2.6.3v2.6.3 | Junio C Hamano | 2015-11-05 | 4 | -3/+115 | |
* | | | | | | | | | | | | | Merge branch 'rs/daemon-plug-child-leak' into maint | Junio C Hamano | 2015-11-05 | 4 | -6/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | daemon: plug memory leakrs/daemon-plug-child-leak | René Scharfe | 2015-11-02 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | run-command: factor out child_process_clear() | René Scharfe | 2015-11-02 | 3 | -6/+17 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maint | Junio C Hamano | 2015-11-05 | 2 | -35/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fix | René Scharfe | 2015-11-01 | 1 | -21/+15 | |
| * | | | | | | | | | | | | | wt-status: don't skip a magical number of characters blindly | René Scharfe | 2015-11-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEAD | René Scharfe | 2015-11-01 | 2 | -7/+10 | |
| * | | | | | | | | | | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking() | René Scharfe | 2015-11-01 | 1 | -8/+5 | |
| * | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEAD | René Scharfe | 2015-11-01 | 1 | -0/+14 | |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint | Junio C Hamano | 2015-11-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |