summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* The eighth batch for 2.15Junio C Hamano2017-09-191-0/+58
* Merge branch 'ma/remove-config-maybe-bool'Junio C Hamano2017-09-191-4/+0
|\
| * config: remove git_config_maybe_boolma/remove-config-maybe-boolMartin Ågren2017-09-071-4/+0
* | Merge branch 'bb/doc-eol-dirty'Junio C Hamano2017-09-191-1/+4
|\ \
| * | Documentation: mention that `eol` can change the dirty status of pathsbb/doc-eol-dirtyBen Boeckel2017-09-071-1/+4
* | | Merge branch 'nd/prune-in-worktree'Junio C Hamano2017-09-192-5/+10
|\ \ \
| * | | rev-list: expose and document --single-worktreeNguyễn Thái Ngọc Duy2017-08-241-0/+8
| * | | refs: remove dead for_each_*_submodule()Nguyễn Thái Ngọc Duy2017-08-241-5/+2
* | | | Sync with maintJunio C Hamano2017-09-101-0/+59
|\ \ \ \
| * | | | RelNotes: further fixes for 2.14.2 from the master frontJunio C Hamano2017-09-101-0/+59
| * | | | Merge branch 'jt/doc-pack-objects-fix' into maintJunio C Hamano2017-09-101-6/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-101-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mg/format-ref-doc-fix' into maintJunio C Hamano2017-09-103-8/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-102-6/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-101-1/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-102-73/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | The seventh batch post 2.14Junio C Hamano2017-09-101-40/+17
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \