Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 17 | -28/+30 |
|\ | |||||
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 17 | -24/+24 |
| * | Documentation/user-manual: update outdated example output | Martin Ågren | 2017-08-23 | 1 | -4/+6 |
* | | The sixth batch post 2.14 | Junio C Hamano | 2017-09-06 | 1 | -0/+10 |
* | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 | 1 | -4/+2 |
|\ \ | |||||
| * | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 | 1 | -4/+2 |
* | | | The fifth batch post 2.14 | Junio C Hamano | 2017-08-26 | 1 | -1/+49 |
* | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 | 1 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'mh/ref-lock-entry' | Junio C Hamano | 2017-08-26 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | refs: retry acquiring reference locks for 100msmh/ref-lock-entry | Michael Haggerty | 2017-08-23 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge branch 'jt/doc-pack-objects-fix' | Junio C Hamano | 2017-08-26 | 1 | -6/+11 |
|\ \ \ | |||||
| * | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix | Jonathan Tan | 2017-08-23 | 1 | -6/+11 |
* | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 | 2 | -8/+30 |
|\ \ \ \ | |||||
| * | | | | doc/interpret-trailers: fix "the this" typojk/trailers-parse | Martin Ågren | 2017-08-20 | 1 | -1/+1 |
| * | | | | pretty: support normalization options for %(trailers) | Jeff King | 2017-08-15 | 1 | -1/+4 |
| * | | | | interpret-trailers: add --parse convenience option | Jeff King | 2017-08-15 | 1 | -7/+14 |
| * | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 | 1 | -0/+4 |
| * | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 | 1 | -0/+5 |
| * | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 | 1 | -0/+3 |
* | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 | 1 | -2/+25 |
|\ \ \ \ \ | |||||
| * | | | | | interpret-trailers: fix documentation typopb/trailers-from-command-line | Paolo Bonzini | 2017-08-14 | 1 | -2/+2 |
| * | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 | 1 | -0/+23 |
* | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-26 | 1 | -5/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fix | Jonathan Tan | 2017-08-16 | 1 | -5/+3 |
* | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-26 | 2 | -2/+49 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | diff: document the new --color-moved setting | Stefan Beller | 2017-06-30 | 2 | -2/+49 |
* | | | | | | | 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/object-id' | Junio C Hamano | 2017-08-24 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-id | René Scharfe | 2017-08-14 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 1 | -0/+8 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Sync with maint | Junio C Hamano | 2017-08-23 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 | 1 | -0/+35 |
| * | | | | | | | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 2 | -63/+65 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 2 | -13/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | 2 | -9/+15 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | 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 'ah/doc-empty-string-is-false' | Junio C Hamano | 2017-08-23 | 2 | -6/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-false | Andreas Heiduk | 2017-08-14 | 2 | -6/+7 |
* | | | | | | | | | | | | Merge branch 'kw/rebase-progress' | Junio C Hamano | 2017-08-23 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | format-patch: have progress option while generating patches | Kevin Willford | 2017-08-14 | 1 | -0/+4 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | The second batch post 2.14 | Junio C Hamano | 2017-08-22 | 1 | -0/+57 |