Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+11 | |
| * | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+17 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 3 | -7/+83 | |
|\ \ \ \ \ | ||||||
| * | | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-ref | Michael Haggerty | 2015-06-08 | 2 | -1/+11 | |
| * | | | | | read_loose_refs(): simplify function logic | Michael Haggerty | 2015-06-03 | 1 | -7/+12 | |
| * | | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 | 2 | -1/+6 | |
| * | | | | | t6301: new tests of for-each-ref error handling | Michael Haggerty | 2015-06-02 | 1 | -0/+56 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 | 2 | -5/+28 | |
|\ \ \ \ \ | ||||||
| * | | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissors | SZEDER Gábor | 2015-06-09 | 2 | -5/+28 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Git 2.4.7v2.4.7 | Junio C Hamano | 2015-07-27 | 4 | -3/+57 | |
* | | | | | Merge branch 'jk/pretty-encoding-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-doc | Jeff King | 2015-06-17 | 1 | -1/+4 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'tb/checkout-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-doc | Torsten Bögershausen | 2015-06-17 | 1 | -1/+5 | |
* | | | | | | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 | 2 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | rev-list: add --count to usage guidels/hint-rev-list-count | Lawrence Siebert | 2015-07-01 | 2 | -0/+2 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'mm/branch-doc-updates' into maint | Junio C Hamano | 2015-07-27 | 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 'jc/fsck-retire-require-eoh' into maint | Junio C Hamano | 2015-07-27 | 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 | |
* | | | | | | | | Merge branch 'et/http-proxyauth' into maint | Junio C Hamano | 2015-07-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | http: always use any proxy auth method availableet/http-proxyauth | Enrique Tobis | 2015-06-29 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint | Junio C Hamano | 2015-07-27 | 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 'mh/strbuf-read-file-returns-ssize-t' into maint | Junio C Hamano | 2015-07-27 | 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 'kb/config-unmap-before-renaming' into maint | Junio C Hamano | 2015-07-27 | 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 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 | 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 'rh/test-color-avoid-terminfo-in-original-home' into maint | Junio C Hamano | 2015-07-27 | 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 'jk/fix-refresh-utime' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | check_and_freshen_file: fix reversed success-checkjk/fix-refresh-utime | Jeff King | 2015-07-08 | 1 | -1/+9 | |
* | | | | | | | | | | | | Merge branch 'cb/rebase-am-exit-code' into maint | Junio C Hamano | 2015-07-27 | 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/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 | 3 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheck | Jeff King | 2015-06-09 | 3 | -3/+14 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Git 2.4.6v2.4.6 | Junio C Hamano | 2015-07-15 | 4 | -3/+27 | |
* | | | | | | | | | | | | Merge branch 'mm/describe-doc' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/describe: improve one-line summarymm/describe-doc | Matthieu Moy | 2015-06-16 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/prompt-document-ps1-state-separator' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separator | Joe Cridge | 2015-06-10 | 1 | -0/+4 | |
* | | | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro' into maint | Junio C Hamano | 2015-07-15 | 4 | -29/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | ewah: use less generic macro namees/osx-header-pollutes-mask-macro | Jeff King | 2015-06-03 | 4 | -23/+23 | |
| * | | | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinition | Eric Sunshine | 2015-06-03 | 1 | -8/+8 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaround | Eric Sunshine | 2015-06-05 | 1 | -1/+3 | |
| |/ / / / / / / / / / / / |