Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | convert: display progress for filtered objects that have been delayedls/convert-filter-progress | Lars Schneider | 2017-08-24 | 2 | -2/+16 |
* | The fourth batch post 2.14 | Junio C Hamano | 2017-08-24 | 1 | -21/+19 |
* | Merge branch 'jk/doc-the-this' | Junio C Hamano | 2017-08-24 | 1 | -2/+2 |
|\ | |||||
| * | doc: fix typo in sendemail.identityjk/doc-the-this | Jeff King | 2017-08-20 | 1 | -2/+2 |
* | | Merge branch 'rs/commit-h-single-parent-cleanup' | Junio C Hamano | 2017-08-24 | 1 | -5/+0 |
|\ \ | |||||
| * | | commit: remove unused inline function single_parent()rs/commit-h-single-parent-cleanup | René Scharfe | 2017-08-19 | 1 | -5/+0 |
* | | | Merge branch 'jc/simplify-progress' | Junio C Hamano | 2017-08-24 | 10 | -19/+20 |
|\ \ \ | |||||
| * | | | progress: simplify "delayed" progress APIjc/simplify-progress | Junio C Hamano | 2017-08-19 | 9 | -18/+19 |
| |/ / | |||||
* | | | Merge branch 'tc/curl-with-backports' | Junio C Hamano | 2017-08-24 | 1 | -4/+6 |
|\ \ \ | |||||
| * | | | http: use a feature check to enable GSSAPI delegation controltc/curl-with-backports | Tom G. Christensen | 2017-08-11 | 1 | -3/+3 |
| * | | | http: fix handling of missing CURLPROTO_* | Tom G. Christensen | 2017-08-11 | 1 | -1/+3 |
* | | | | Merge branch 'cc/subprocess-handshake-missing-capabilities' | Junio C Hamano | 2017-08-24 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | sub-process: print the cmd when a capability is unsupported | Christian Couder | 2017-08-16 | 1 | -2/+2 |
* | | | | | Merge branch 'rs/object-id' | Junio C Hamano | 2017-08-24 | 8 | -23/+23 |
|\ \ \ \ \ | |||||
| * | | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-id | René Scharfe | 2017-08-14 | 8 | -23/+23 |
* | | | | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 3 | -0/+81 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 3 | -0/+81 |
* | | | | | | | Sync with maint | Junio C Hamano | 2017-08-23 | 1 | -0/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 | 3 | -2/+37 |
| * | | | | | | | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jb/t8008-cleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -14/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 14 | -285/+802 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 2 | -13/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/ref-is-hidden-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/run-process-parallel-api-fix' into maint | Junio C Hamano | 2017-08-23 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/pack-objects-pbase-cleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2017-08-23 | 3 | -27/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/stat-data-unaligned-reads-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -23/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/move-array' into maint | Junio C Hamano | 2017-08-23 | 11 | -30/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/bswap-ubsan-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -14/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hb/gitweb-project-list' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/commit-abort-on-empty-message-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reflog-walk' into maint | Junio C Hamano | 2017-08-23 | 8 | -123/+253 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint | Junio C Hamano | 2017-08-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | 22 | -220/+362 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/git-gui-msgfmt-on-windows' into maint | Junio C Hamano | 2017-08-23 | 2 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | The third batch post 2.14 | Junio C Hamano | 2017-08-23 | 1 | -0/+30 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/format-ref-doc-fix' | Junio C Hamano | 2017-08-23 | 3 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-for-each-ref: clarify peeling of tags for --formatmg/format-ref-doc-fix | Michael J Gruber | 2017-08-18 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: use proper wording for ref format strings | Michael J Gruber | 2017-08-18 | 3 | -6/+6 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2017-08-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | submodule.sh: remove unused variablesb/submodule-parallel-update | Stefan Beller | 2017-08-17 | 1 | -1/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-sane-truncate-no-more' | Junio C Hamano | 2017-08-23 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff: retire sane_truncate_fnjc/diff-sane-truncate-no-more | Junio C Hamano | 2017-08-17 | 1 | -5/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/t5526-andand-chain-fix' | Junio C Hamano | 2017-08-23 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5526: fix some broken && chainshv/t5526-andand-chain-fix | Heiko Voigt | 2017-08-17 | 1 | -4/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' | Junio C Hamano | 2017-08-23 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fix | Anthony Sottile | 2017-08-17 | 2 | -1/+6 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / |