summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* worktree: fix option descriptions for `prune`ps/worktree-prune-help-fixPatrick Steinhardt2017-02-061-2/+2
* Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-1313-126/+217
|\
| * worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-2911-114/+198
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-122-12/+19
* | Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano2015-07-131-13/+6
|\ \
| * | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | Merge branch 'kb/config-unmap-before-renaming'Junio C Hamano2015-07-131-0/+3
|\ \ \
| * | | config.c: fix writing config files on Windows network shareskb/config-unmap-before-renamingKarsten Blees2015-06-301-0/+3
| |/ /
* | | Merge branch 'mh/strbuf-read-file-returns-ssize-t'Junio C Hamano2015-07-132-3/+4
|\ \ \
| * | | strbuf: strbuf_read_file() should return ssize_tmh/strbuf-read-file-returns-ssize-tMichael Haggerty2015-07-032-3/+4
| |/ /
* | | Merge branch 'jc/unexport-git-pager-in-use-in-pager'Junio C Hamano2015-07-131-0/+1
|\ \ \
| * | | pager: do not leak "GIT_PAGER_IN_USE" to the pagerjc/unexport-git-pager-in-use-in-pagerJunio C Hamano2015-07-031-0/+1
* | | | Merge branch 'kb/use-nsec-doc'Junio C Hamano2015-07-132-6/+11
|\ \ \ \
| * | | | Makefile / racy-git.txt: clarify USE_NSEC prerequisiteskb/use-nsec-docKarsten Blees2015-07-012-6/+11
* | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-132-1/+26
|\ \ \ \ \
| * | | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skipJohannes Schindelin2015-06-292-2/+6
| * | | | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-291-0/+21
* | | | | | Merge branch 'et/http-proxyauth'Junio C Hamano2015-07-131-2/+2
|\ \ \ \ \ \
| * | | | | | http: always use any proxy auth method availableet/http-proxyauthEnrique Tobis2015-06-291-2/+2
* | | | | | | Merge branch 'jc/fsck-retire-require-eoh'Junio C Hamano2015-07-131-4/+13
|\ \ \ \ \ \ \
| * | | | | | | fsck: it is OK for a tag and a commit to lack the bodyjc/fsck-retire-require-eohJunio C Hamano2015-06-281-4/+13
* | | | | | | | The last minute bits of fixesJunio C Hamano2015-07-101-0/+21
* | | | | | | | Merge branch 'cb/rebase-am-exit-code'Junio C Hamano2015-07-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: return non-zero error code if format-patch failscb/rebase-am-exit-codeClemens Buchacher2015-07-081-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/fix-refresh-utime'Junio C Hamano2015-07-101-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | check_and_freshen_file: fix reversed success-checkjk/fix-refresh-utimeJeff King2015-07-081-1/+9
* | | | | | | | | Merge branch 'mm/branch-doc-updates'Junio C Hamano2015-07-101-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/branch: document -M and -D in terms of --forcemm/branch-doc-updatesMatthieu Moy2015-07-061-2/+2
| * | | | | | | | | Documentation/branch: document -d --force and -m --forceMatthieu Moy2015-07-061-0/+4
* | | | | | | | | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-102-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-012-0/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-102-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-012-1/+7
* | | | | | | | | | | Merge branch 'cb/subtree-tests-update'Junio C Hamano2015-07-101-152/+150
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib/subtree: small tidy-up to testcb/subtree-tests-updateCharles Bailey2015-06-221-3/+1
| * | | | | | | | | | | contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey2015-06-221-4/+4
| * | | | | | | | | | | contrib/subtree: use tabs consitently for indentation in testsCharles Bailey2015-06-221-147/+147
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-07-101-52/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-lib.sh: fix color support when tput needs ~/.terminforh/test-color-avoid-terminfo-in-original-homeRichard Hansen2015-06-171-29/+28
| * | | | | | | | | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-171-47/+43
* | | | | | | | | | | | Merge branch 'sb/p5310-and-chain'Junio C Hamano2015-07-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | p5310: Fix broken && chain in performance testsb/p5310-and-chainStefan Beller2015-06-261-3/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tb/checkout-doc'Junio C Hamano2015-07-101-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-docTorsten Bögershausen2015-06-171-1/+5
* | | | | | | | | | | | | Merge branch 'jk/pretty-encoding-doc'Junio C Hamano2015-07-101-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-docJeff King2015-06-171-1/+4
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-07-101-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy2015-07-011-0/+26
* | | | | | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2015-07-092-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-objectJeff King2015-06-222-1/+7