summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'jc/receive-pack-hook-doc'Junio C Hamano2017-12-131-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | hooks doc: clarify when receive-pack invokes its hooksjc/receive-pack-hook-docJunio C Hamano2017-11-241-10/+10
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ra/decorate-limit-refs'Junio C Hamano2017-12-131-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | log: add option to choose which refs to decoratera/decorate-limit-refsRafael Ascensão2017-11-221-0/+7
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | RelNotes: the eighth batchJunio C Hamano2017-12-061-13/+45
* | | | | | | | | | | | Sync with maintJunio C Hamano2017-12-061-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Prepare for 2.15.2maint-2.15Junio C Hamano2017-12-061-0/+47
| * | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano2017-12-061-8/+56
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/submitting-patches-in-asciidoc' into maintJunio C Hamano2017-12-063-161/+192
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/ssh-wrappers'Junio C Hamano2017-12-061-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ssh: 'auto' variant to select between 'ssh' and 'simple'Jonathan Nieder2017-11-211-10/+16
* | | | | | | | | | | | | | | Merge branch 'bw/protocol-v1'Junio C Hamano2017-12-064-16/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Documentation: document Extra ParametersJonathan Tan2017-10-172-7/+44
| * | | | | | | | | | | | | | ssh: introduce a 'simple' ssh variantBrandon Williams2017-10-172-9/+27
| * | | | | | | | | | | | | | protocol: introduce protocol extension mechanismsBrandon Williams2017-10-172-0/+23
* | | | | | | | | | | | | | | Merge branch 'sp/doc-info-attributes'Junio C Hamano2017-12-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | doc: Mention info/attributes in gitrepository-layoutsp/doc-info-attributesSteffen Prohaska2017-11-241-0/+4
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'tg/deprecate-stash-save'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | doc: prefer 'stash push' over 'stash save'tg/deprecate-stash-savePhil Hord2017-11-221-2/+2
* | | | | | | | | | | | | | | | Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2017-12-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | notes: correct 'git notes prune' options to '[-n] [-v]'rd/doc-notes-prune-fixRobert P. J. Day2017-11-221-1/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rd/man-reflog-add-n'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | doc: add missing "-n" (dry-run) option to reflog man pagerd/man-reflog-add-npd/man-reflog-add-nRobert P. J. Day2017-11-221-2/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'rd/man-prune-progress'Junio C Hamano2017-12-061-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | prune: add "--progress" to man page and usage msgrd/man-prune-progresspd/man-prune-progressRobert P. J. Day2017-11-221-3/+6
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'hm/config-parse-expiry-date'Junio C Hamano2017-12-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: add --expiry-datehm/config-parse-expiry-dateHaaris Mehmood2017-11-181-0/+5
* | | | | | | | | | | | | | | | | Merge branch 'tz/branch-doc-remove-set-upstream'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch doc: remove --set-upstream from synopsistz/branch-doc-remove-set-upstreamTodd Zullinger2017-11-171-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano2017-12-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Documentation/checkout: clarify submodule HEADs to be detachedsb/submodule-recursive-checkout-detach-headStefan Beller2017-07-281-0/+2
* | | | | | | | | | | | | | | | | | Sync with v2.15.1Junio C Hamano2017-11-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Git 2.15.1v2.15.1Junio C Hamano2017-11-281-0/+3
* | | | | | | | | | | | | | | | | | RelNotes: the seventh batchJunio C Hamano2017-11-281-1/+13
* | | | | | | | | | | | | | | | | | Merge branch 'ma/branch-list-paginate'Junio C Hamano2017-11-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | branch: change default of `pager.branch` to "on"ma/branch-list-paginateMartin Ågren2017-11-201-1/+1
| * | | | | | | | | | | | | | | | | branch: respect `pager.branch` in list-mode onlyMartin Ågren2017-11-201-0/+6
* | | | | | | | | | | | | | | | | | RelNotes: the sixth batch for 2.16Junio C Hamano2017-11-271-8/+65
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-11-271-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | A bit more fixes for 2.15.1Junio C Hamano2017-11-271-0/+5
| * | | | | | | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-271-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-272-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-172-3/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema...Rasmus Villemoes2017-11-141-0/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc'Junio C Hamano2017-11-271-8/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | merge-base --fork-point doc: clarify the example and failure modesjc/merge-base-fork-point-docJunio C Hamano2017-11-091-8/+56
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-272-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-082-2/+6