summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/up-to-date'Junio C Hamano2017-09-1017-28/+30
|\
| * treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-2317-24/+24
| * Documentation/user-manual: update outdated example outputMartin Ågren2017-08-231-4/+6
* | The sixth batch post 2.14Junio C Hamano2017-09-061-0/+10
* | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-061-4/+2
|\ \
| * | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-171-4/+2
* | | The fifth batch post 2.14Junio C Hamano2017-08-261-1/+49
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-1/+4
|\ \ \
| * | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
| | |/ | |/|
* | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-261-0/+6
|\ \ \
| * | | refs: retry acquiring reference locks for 100msmh/ref-lock-entryMichael Haggerty2017-08-231-0/+6
| |/ /
* | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-261-6/+11
|\ \ \
| * | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fixJonathan Tan2017-08-231-6/+11
* | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-261-0/+2
|\ \ \ \
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-0/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-262-8/+30
|\ \ \ \
| * | | | doc/interpret-trailers: fix "the this" typojk/trailers-parseMartin Ågren2017-08-201-1/+1
| * | | | pretty: support normalization options for %(trailers)Jeff King2017-08-151-1/+4
| * | | | interpret-trailers: add --parse convenience optionJeff King2017-08-151-7/+14
| * | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-151-0/+4
| * | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-151-0/+5
| * | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-151-0/+3
* | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-261-2/+25
|\ \ \ \ \
| * | | | | interpret-trailers: fix documentation typopb/trailers-from-command-linePaolo Bonzini2017-08-141-2/+2
| * | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-141-0/+23
* | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-261-5/+3
|\ \ \ \ \ \
| * | | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-5/+3
* | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-262-2/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | diff: document the new --color-moved settingStefan Beller2017-06-302-2/+49
* | | | | | | 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/object-id'Junio C Hamano2017-08-241-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-141-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-241-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-251-0/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Sync with maintJunio C Hamano2017-08-231-0/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Prepare for 2.14.2Junio C Hamano2017-08-231-0/+35
| * | | | | | | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-232-63/+65
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-232-9/+15
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | 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 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-232-6/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-falseAndreas Heiduk2017-08-142-6/+7
* | | | | | | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | format-patch: have progress option while generating patchesKevin Willford2017-08-141-0/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | The second batch post 2.14Junio C Hamano2017-08-221-0/+57