aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Sync with maintJunio C Hamano2017-09-10
|\
| * RelNotes: further fixes for 2.14.2 from the master frontJunio C Hamano2017-09-10
| * Merge branch 'jt/doc-pack-objects-fix' into maintJunio C Hamano2017-09-10
| |\
| * \ Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-10
| |\ \
| * \ \ Merge branch 'mg/format-ref-doc-fix' into maintJunio C Hamano2017-09-10
| |\ \ \
| * \ \ \ Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-10
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \
* | | | | | | | The seventh batch post 2.14Junio C Hamano2017-09-10
* | | | | | | | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-10
|\ \ \ \ \ \ \ \
| * | | | | | | | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-23
| * | | | | | | | Documentation/user-manual: update outdated example outputMartin Ågren2017-08-23
* | | | | | | | | The sixth batch post 2.14Junio C Hamano2017-09-06
* | | | | | | | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-17
* | | | | | | | | | The fifth batch post 2.14Junio C Hamano2017-08-26
* | | | | | | | | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-21
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: retry acquiring reference locks for 100msMichael Haggerty2017-08-23
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Doc: clarify that pack-objects makes packs, pluralJonathan Tan2017-08-23
* | | | | | | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano2017-08-22
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc/interpret-trailers: fix "the this" typoMartin Ågren2017-08-20
| * | | | | | | | | pretty: support normalization options for %(trailers)Jeff King2017-08-15
| * | | | | | | | | interpret-trailers: add --parse convenience optionJeff King2017-08-15
| * | | | | | | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-15
| * | | | | | | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-15
| * | | | | | | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-15
* | | | | | | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | interpret-trailers: fix documentation typoPaolo Bonzini2017-08-14
| * | | | | | | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-14
* | | | | | | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: define block by number of alphanumeric charsJonathan Tan2017-08-16
* | | | | | | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | diff: document the new --color-moved settingStefan Beller2017-06-30
* | | | | | | | | | | | The fourth batch post 2.14Junio C Hamano2017-08-24
* | | | | | | | | | | | Merge branch 'jk/doc-the-this'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | doc: fix typo in sendemail.identityJeff King2017-08-20
* | | | | | | | | | | | Merge branch 'rs/object-id'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe2017-08-14
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: add a --signoff flagŁukasz Gryglicki2017-07-25
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Sync with maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Prepare for 2.14.2Junio C Hamano2017-08-23
| * | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |