summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* convert: display progress for filtered objects that have been delayedls/convert-filter-progressLars Schneider2017-08-242-2/+16
* The fourth batch post 2.14Junio C Hamano2017-08-241-21/+19
* Merge branch 'jk/doc-the-this'Junio C Hamano2017-08-241-2/+2
|\
| * doc: fix typo in sendemail.identityjk/doc-the-thisJeff King2017-08-201-2/+2
* | Merge branch 'rs/commit-h-single-parent-cleanup'Junio C Hamano2017-08-241-5/+0
|\ \
| * | commit: remove unused inline function single_parent()rs/commit-h-single-parent-cleanupRené Scharfe2017-08-191-5/+0
* | | Merge branch 'jc/simplify-progress'Junio C Hamano2017-08-2410-19/+20
|\ \ \
| * | | progress: simplify "delayed" progress APIjc/simplify-progressJunio C Hamano2017-08-199-18/+19
| |/ /
* | | Merge branch 'tc/curl-with-backports'Junio C Hamano2017-08-241-4/+6
|\ \ \
| * | | http: use a feature check to enable GSSAPI delegation controltc/curl-with-backportsTom G. Christensen2017-08-111-3/+3
| * | | http: fix handling of missing CURLPROTO_*Tom G. Christensen2017-08-111-1/+3
* | | | Merge branch 'cc/subprocess-handshake-missing-capabilities'Junio C Hamano2017-08-241-2/+2
|\ \ \ \
| * | | | sub-process: print the cmd when a capability is unsupportedChristian Couder2017-08-161-2/+2
* | | | | Merge branch 'rs/object-id'Junio C Hamano2017-08-248-23/+23
|\ \ \ \ \
| * | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-148-23/+23
* | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-243-0/+81
|\ \ \ \ \ \
| * | | | | | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-253-0/+81
* | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / / / / /