summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch 'cb/rebase-am-exit-code' into maintJunio C Hamano2015-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: return non-zero error code if format-patch failscb/rebase-am-exit-codeClemens Buchacher2015-07-081-1/+1
* | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-273-3/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-093-3/+14
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Git 2.4.6v2.4.6Junio C Hamano2015-07-154-3/+27
* | | | | | | | | | | Merge branch 'mm/describe-doc' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/describe: improve one-line summarymm/describe-docMatthieu Moy2015-06-161-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano2015-07-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separatorJoe Cridge2015-06-101-0/+4
* | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano2015-07-154-29/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ewah: use less generic macro namees/osx-header-pollutes-mask-macroJeff King2015-06-034-23/+23
| * | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine2015-06-031-8/+8
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano2015-07-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaroundEric Sunshine2015-06-051-1/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vnFrans Klaver2015-06-101-1/+1
* | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanityPaul Tan2015-06-121-1/+1
* | | | | | | | | | | | | | Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safetyMike Edgar2015-06-171-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
| * | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |