Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vn | Frans Klaver | 2015-06-10 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'me/fetch-into-shallow-safety' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safety | Mike Edgar | 2015-06-17 | 1 | -1/+1 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 | 1 | -14/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entries | Michael Haggerty | 2015-06-08 | 1 | -4/+9 |
| * | | | | | | | | | | | | fsck_handle_reflog_sha1(): new function | Michael Haggerty | 2015-06-08 | 1 | -14/+15 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'af/tcsh-completion-noclobber' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobber | Ariel Faigon | 2015-06-09 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osx | Panagiotis Astithas | 2015-06-12 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 2 | -6/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marks | Junio C Hamano | 2015-06-01 | 2 | -6/+14 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-06-25 | 2 | -9/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 2 | -9/+0 |
* | | | | | | | | | | | | Merge branch 'cb/array-size' into maint | Junio C Hamano | 2015-06-25 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-size | Charles Bailey | 2015-06-24 | 1 | -5/+3 |