Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | worktree: fix option descriptions for `prune`ps/worktree-prune-help-fix | Patrick Steinhardt | 2017-02-06 | 1 | -2/+2 |
* | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-07-13 | 13 | -126/+217 |
|\ | |||||
| * | worktree: new place for "git prune --worktrees"nd/multiple-work-trees | Nguyễn Thái Ngọc Duy | 2015-06-29 | 11 | -114/+198 |
| * | checkout: don't check worktrees when not necessary | Nguyễn Thái Ngọc Duy | 2015-06-12 | 2 | -12/+19 |
* | | Merge branch 'ss/clone-guess-dir-name-simplify' | Junio C Hamano | 2015-07-13 | 1 | -13/+6 |
|\ \ | |||||
| * | | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplify | Sebastian Schuberth | 2015-07-09 | 1 | -13/+6 |
* | | | Merge branch 'kb/config-unmap-before-renaming' | Junio C Hamano | 2015-07-13 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | config.c: fix writing config files on Windows network shareskb/config-unmap-before-renaming | Karsten Blees | 2015-06-30 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge branch 'mh/strbuf-read-file-returns-ssize-t' | Junio C Hamano | 2015-07-13 | 2 | -3/+4 |
|\ \ \ | |||||
| * | | | strbuf: strbuf_read_file() should return ssize_tmh/strbuf-read-file-returns-ssize-t | Michael Haggerty | 2015-07-03 | 2 | -3/+4 |
| |/ / | |||||
* | | | Merge branch 'jc/unexport-git-pager-in-use-in-pager' | Junio C Hamano | 2015-07-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | pager: do not leak "GIT_PAGER_IN_USE" to the pagerjc/unexport-git-pager-in-use-in-pager | Junio C Hamano | 2015-07-03 | 1 | -0/+1 |
* | | | | Merge branch 'kb/use-nsec-doc' | Junio C Hamano | 2015-07-13 | 2 | -6/+11 |
|\ \ \ \ | |||||
| * | | | | Makefile / racy-git.txt: clarify USE_NSEC prerequisiteskb/use-nsec-doc | Karsten Blees | 2015-07-01 | 2 | -6/+11 |
* | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' | Junio C Hamano | 2015-07-13 | 2 | -1/+26 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skip | Johannes Schindelin | 2015-06-29 | 2 | -2/+6 |
| * | | | | | t3404: demonstrate CHERRY_PICK_HEAD bug | Johannes Schindelin | 2015-06-29 | 1 | -0/+21 |
* | | | | | | Merge branch 'et/http-proxyauth' | Junio C Hamano | 2015-07-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http: always use any proxy auth method availableet/http-proxyauth | Enrique Tobis | 2015-06-29 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jc/fsck-retire-require-eoh' | Junio C Hamano | 2015-07-13 | 1 | -4/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fsck: it is OK for a tag and a commit to lack the bodyjc/fsck-retire-require-eoh | Junio C Hamano | 2015-06-28 | 1 | -4/+13 |
* | | | | | | | | The last minute bits of fixes | Junio C Hamano | 2015-07-10 | 1 | -0/+21 |
* | | | | | | | | Merge branch 'cb/rebase-am-exit-code' | Junio C Hamano | 2015-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: return non-zero error code if format-patch failscb/rebase-am-exit-code | Clemens Buchacher | 2015-07-08 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/fix-refresh-utime' | Junio C Hamano | 2015-07-10 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | check_and_freshen_file: fix reversed success-checkjk/fix-refresh-utime | Jeff King | 2015-07-08 | 1 | -1/+9 |
* | | | | | | | | | Merge branch 'mm/branch-doc-updates' | Junio C Hamano | 2015-07-10 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/branch: document -M and -D in terms of --forcemm/branch-doc-updates | Matthieu Moy | 2015-07-06 | 1 | -2/+2 |
| * | | | | | | | | | Documentation/branch: document -d --force and -m --force | Matthieu Moy | 2015-07-06 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'ls/hint-rev-list-count' | Junio C Hamano | 2015-07-10 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-list: add --count to usage guidels/hint-rev-list-count | Lawrence Siebert | 2015-07-01 | 2 | -0/+2 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' | Junio C Hamano | 2015-07-10 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruning | Jeff King | 2015-07-01 | 2 | -1/+7 |
* | | | | | | | | | | | Merge branch 'cb/subtree-tests-update' | Junio C Hamano | 2015-07-10 | 1 | -152/+150 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | contrib/subtree: small tidy-up to testcb/subtree-tests-update | Charles Bailey | 2015-06-22 | 1 | -3/+1 |
| * | | | | | | | | | | | contrib/subtree: fix broken &&-chains and revealed test error | Charles Bailey | 2015-06-22 | 1 | -4/+4 |
| * | | | | | | | | | | | contrib/subtree: use tabs consitently for indentation in tests | Charles Bailey | 2015-06-22 | 1 | -147/+147 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' | Junio C Hamano | 2015-07-10 | 1 | -52/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-lib.sh: fix color support when tput needs ~/.terminforh/test-color-avoid-terminfo-in-original-home | Richard Hansen | 2015-06-17 | 1 | -29/+28 |
| * | | | | | | | | | | | Revert "test-lib.sh: do tests for color support after changing HOME" | Richard Hansen | 2015-06-17 | 1 | -47/+43 |
* | | | | | | | | | | | | Merge branch 'sb/p5310-and-chain' | Junio C Hamano | 2015-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | p5310: Fix broken && chain in performance testsb/p5310-and-chain | Stefan Beller | 2015-06-26 | 1 | -3/+3 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'tb/checkout-doc' | Junio C Hamano | 2015-07-10 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-doc | Torsten Bögershausen | 2015-06-17 | 1 | -1/+5 |
* | | | | | | | | | | | | | Merge branch 'jk/pretty-encoding-doc' | Junio C Hamano | 2015-07-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-doc | Jeff King | 2015-06-17 | 1 | -1/+4 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2015-07-10 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add tests for wildcard "path vs ref" disambiguation | Nguyễn Thái Ngọc Duy | 2015-07-01 | 1 | -0/+26 |
* | | | | | | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object' | Junio C Hamano | 2015-07-09 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-object | Jeff King | 2015-06-22 | 2 | -1/+7 |