summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusionSZEDER Gábor2015-08-212-1/+1
* Git 2.4.8v2.4.8Junio C Hamano2015-08-034-5/+25
* Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-032-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 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
|\ \
| * | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-031-1/+1
|\ \ \
| * | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanupSZEDER Gábor2015-06-081-1/+1
* | | | Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-032-8/+104
|\ \ \ \
| * | | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-082-1/+12
| * | | | am --abort: support aborting to unborn branchPaul Tan2015-06-082-1/+25
| * | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+28
| * | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-082-3/+11
| * | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-082-1/+11
| * | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+17
| | |_|/ | |/| |
* | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-033-7/+83
|\ \ \ \
| * | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-refMichael Haggerty2015-06-082-1/+11
| * | | | read_loose_refs(): simplify function logicMichael Haggerty2015-06-031-7/+12
| * | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-022-1/+6
| * | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-021-0/+56
* | | | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-032-5/+28
|\ \ \ \ \
| * | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissorsSZEDER Gábor2015-06-092-5/+28
| | |_|/ / | |/| | |
* | | | | Git 2.4.7v2.4.7Junio C Hamano2015-07-274-3/+57
* | | | | Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano2015-07-271-1/+4
|\ \ \ \ \
| * | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-docJeff King2015-06-171-1/+4
| |/ / / /
* | | | | Merge branch 'tb/checkout-doc' into maintJunio C Hamano2015-07-271-1/+5
|\ \ \ \ \
| * | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-docTorsten Bögershausen2015-06-171-1/+5
* | | | | | Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-272-0/+2
|\ \ \ \ \ \
| * | | | | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-012-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano2015-07-271-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 'jc/fsck-retire-require-eoh' into maintJunio C Hamano2015-07-271-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
* | | | | | | | Merge branch 'et/http-proxyauth' into maintJunio C Hamano2015-07-271-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | http: always use any proxy auth method availableet/http-proxyauthEnrique Tobis2015-06-291-2/+2
* | | | | | | | | Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintJunio C Hamano2015-07-271-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 'mh/strbuf-read-file-returns-ssize-t' into maintJunio C Hamano2015-07-272-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | strbuf: strbuf_read_file() should return ssize_tmh/strbuf-read-file-returns-ssize-tMichael Haggerty2015-07-032-3/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'kb/config-unmap-before-renaming' into maintJunio C Hamano2015-07-271-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config.c: fix writing config files on Windows network shareskb/config-unmap-before-renamingKarsten Blees2015-06-301-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-272-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-012-1/+7
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-271-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 'jk/fix-refresh-utime' into maintJunio C Hamano2015-07-271-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check_and_freshen_file: fix reversed success-checkjk/fix-refresh-utimeJeff King2015-07-081-1/+9
View Lorry Controller Status