summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-2310-148/+163
* pack: move pack_report()Jonathan Tan2017-08-234-26/+26
* pack: move static state variablesJonathan Tan2017-08-233-13/+23
* pack: move pack name-related functionsJonathan Tan2017-08-2310-45/+56
* Sync with maintJunio C Hamano2017-08-231-0/+35
|\
| * Prepare for 2.14.2Junio C Hamano2017-08-233-2/+37
| * Merge branch 'jt/t1450-fsck-corrupt-packfile' into maintJunio C Hamano2017-08-231-0/+16
| |\
| * \ Merge branch 'jb/t8008-cleanup' into maintJunio C Hamano2017-08-231-14/+16
| |\ \
| * \ \ Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-2314-285/+802
| |\ \ \
| * \ \ \ Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-231-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cc/ref-is-hidden-microcleanup' into maintJunio C Hamano2017-08-231-5/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-232-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/pack-objects-pbase-cleanup' into maintJunio C Hamano2017-08-231-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2017-08-233-27/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/stat-data-unaligned-reads-fix' into maintJunio C Hamano2017-08-231-23/+27
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/move-array' into maintJunio C Hamano2017-08-2311-30/+44
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/bswap-ubsan-fix' into maintJunio C Hamano2017-08-231-14/+24
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maintJunio C Hamano2017-08-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hb/gitweb-project-list' into maintJunio C Hamano2017-08-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/commit-abort-on-empty-message-fix' into maintJunio C Hamano2017-08-231-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-238-123/+253
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maintJunio C Hamano2017-08-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-2322-220/+362
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/git-gui-msgfmt-on-windows' into maintJunio C Hamano2017-08-232-7/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | The third batch post 2.14Junio C Hamano2017-08-231-0/+30
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/format-ref-doc-fix'Junio C Hamano2017-08-233-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Documentation/git-for-each-ref: clarify peeling of tags for --formatmg/format-ref-doc-fixMichael J Gruber2017-08-181-2/+3
| * | | | | | | | | | | | | | | | | | | | | Documentation: use proper wording for ref format stringsMichael J Gruber2017-08-183-6/+6
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2017-08-231-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | submodule.sh: remove unused variablesb/submodule-parallel-updateStefan Beller2017-08-171-1/+0
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-sane-truncate-no-more'Junio C Hamano2017-08-231-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | diff: retire sane_truncate_fnjc/diff-sane-truncate-no-moreJunio C Hamano2017-08-171-5/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/t5526-andand-chain-fix'Junio C Hamano2017-08-231-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t5526: fix some broken && chainshv/t5526-andand-chain-fixHeiko Voigt2017-08-171-4/+4
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix'Junio C Hamano2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fixAnthony Sottile2017-08-172-1/+6
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-231-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | commit: skip discarding the index if there is no pre-commit hookkw/commit-keep-index-when-pre-commit-is-not-runKevin Willford2017-08-161-6/+9
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sha1-file-cleanup'Junio C Hamano2017-08-232-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | sha1_file: make read_info_alternates staticsb/sha1-file-cleanupStefan Beller2017-08-152-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/t1002-do-not-use-sum'Junio C Hamano2017-08-232-35/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t1002: stop using sum(1)rs/t1002-do-not-use-sumRené Scharfe2017-08-152-35/+35
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4'Junio C Hamano2017-08-231-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | stash: prevent warning about null bytes in inputkd/stash-with-bash-4.4Kevin Daudt2017-08-141-2/+9
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-232-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-falseAndreas Heiduk2017-08-142-6/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-234-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase: turn on progress option by default for format-patchkw/rebase-progressKevin Willford2017-08-142-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: have progress option while generating patchesKevin Willford2017-08-142-0/+14