Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Sync with maint | Junio C Hamano | 2017-09-10 |
|\ | |||
| * | RelNotes: further fixes for 2.14.2 from the master front | Junio C Hamano | 2017-09-10 |
| * | Merge branch 'jt/doc-pack-objects-fix' into maint | Junio C Hamano | 2017-09-10 |
| |\ | |||
| * \ | Merge branch 'jk/doc-the-this' into maint | Junio C Hamano | 2017-09-10 |
| |\ \ | |||
| * \ \ | Merge branch 'mg/format-ref-doc-fix' into maint | Junio C Hamano | 2017-09-10 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'ah/doc-empty-string-is-false' into maint | Junio C Hamano | 2017-09-10 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | The seventh batch post 2.14 | Junio C Hamano | 2017-09-10 |
* | | | | | | | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | treewide: correct several "up-to-date" to "up to date" | Martin Ågren | 2017-08-23 |
| * | | | | | | | | Documentation/user-manual: update outdated example output | Martin Ågren | 2017-08-23 |
* | | | | | | | | | The sixth batch post 2.14 | Junio C Hamano | 2017-09-06 |
* | | | | | | | | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 |
* | | | | | | | | | | The fifth batch post 2.14 | Junio C Hamano | 2017-08-26 |
* | | | | | | | | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'mh/ref-lock-entry' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | refs: retry acquiring reference locks for 100ms | Michael Haggerty | 2017-08-23 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jt/doc-pack-objects-fix' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Doc: clarify that pack-objects makes packs, plural | Jonathan Tan | 2017-08-23 |
* | | | | | | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved | Junio C Hamano | 2017-08-22 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | doc/interpret-trailers: fix "the this" typo | Martin Ågren | 2017-08-20 |
| * | | | | | | | | | pretty: support normalization options for %(trailers) | Jeff King | 2017-08-15 |
| * | | | | | | | | | interpret-trailers: add --parse convenience option | Jeff King | 2017-08-15 |
| * | | | | | | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 |
| * | | | | | | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 |
| * | | | | | | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 |
* | | | | | | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | interpret-trailers: fix documentation typo | Paolo Bonzini | 2017-08-14 |
| * | | | | | | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 |
* | | | | | | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | diff: define block by number of alphanumeric chars | Jonathan Tan | 2017-08-16 |
* | | | | | | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||
| * | | | | | | | | | | | diff: document the new --color-moved setting | Stefan Beller | 2017-06-30 |
* | | | | | | | | | | | | The fourth batch post 2.14 | Junio C Hamano | 2017-08-24 |
* | | | | | | | | | | | | Merge branch 'jk/doc-the-this' | Junio C Hamano | 2017-08-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | doc: fix typo in sendemail.identity | Jeff King | 2017-08-20 |
* | | | | | | | | | | | | Merge branch 'rs/object-id' | Junio C Hamano | 2017-08-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | tree-walk: convert fill_tree_descriptor() to object_id | René Scharfe | 2017-08-14 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | merge: add a --signoff flag | Łukasz Gryglicki | 2017-07-25 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-08-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 |
| * | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |