summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* A bit of updates post -rc0Junio C Hamano2016-11-011-7/+8
* Git 2.11-rc0v2.11.0-rc0Junio C Hamano2016-10-311-27/+41
* Merge branch 'sc/fmt-merge-msg-doc-markup-fix'Junio C Hamano2016-10-311-2/+2
|\
| * Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fixStefan Christ2016-10-281-2/+2
* | Merge branch 'jk/rebase-config-insn-fmt-docfix'Junio C Hamano2016-10-311-1/+1
|\ \
| * | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfixJeff King2016-10-301-1/+1
| |/
* | Merge branch 'aw/numbered-stash'Junio C Hamano2016-10-311-1/+2
|\ \
| * | stash: allow stashes to be referenced by index onlyaw/numbered-stashAaron M Watson2016-10-261-1/+2
* | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-10-311-6/+8
|\ \ \
| * | | trailer: support values folded to multiple linesJonathan Tan2016-10-211-3/+4
| * | | trailer: forbid leading whitespace in trailersJonathan Tan2016-10-211-1/+1
| * | | trailer: allow non-trailers in trailer blockJonathan Tan2016-10-211-2/+3
* | | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-311-1/+156
|\ \ \ \
| * | | | contrib/long-running-filter: add long running filter exampleLars Schneider2016-10-171-1/+3
| * | | | convert: add filter.<driver>.process optionLars Schneider2016-10-171-1/+154
* | | | | Sync with 2.10.2Junio C Hamano2016-10-282-1/+68
|\ \ \ \ \
| * | | | | Git 2.10.2v2.10.2Junio C Hamano2016-10-282-1/+68
| * | | | | Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano2016-10-281-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2016-10-282-21/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2016-10-282-3/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano2016-10-281-5/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/commit-p-doc' into maintJunio C Hamano2016-10-281-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano2016-10-281-3/+2
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Getting ready for 2.11-rc0Junio C Hamano2016-10-271-1/+36
* | | | | | | | | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-241-0/+8
* | | | | | | | | | | | | Eleventh batch for 2.11Junio C Hamano2016-10-261-0/+106
* | | | | | | | | | | | | Merge branch 'po/fix-doc-merge-base-illustration'Junio C Hamano2016-10-262-21/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustrationPhilip Oakley2016-10-241-8/+8
| * | | | | | | | | | | | doc: fix merge-base ASCII art tab spacingPhilip Oakley2016-10-211-13/+13
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'Junio C Hamano2016-10-261-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | doc: remove reference to the traditional layout in git-tag.txtyk/git-tag-remove-mention-of-old-layout-in-docYounes Khoudli2016-10-201-3/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc'Junio C Hamano2016-10-262-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-docBrandon Williams2016-10-192-3/+8
* | | | | | | | | | | Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-261-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-121-2/+8
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-262-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodulesBrandon Williams2016-10-101-2/+1
| * | | | | | | | | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-101-1/+7
| * | | | | | | | | | | git: make super-prefix optionBrandon Williams2016-10-101-0/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-262-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-042-0/+8
* | | | | | | | | | | Tenth batch for 2.11Junio C Hamano2016-10-171-16/+49
* | | | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path'Junio C Hamano2016-10-171-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/pretty-format-color-doc-fix'Junio C Hamano2016-10-171-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fixRené Scharfe2016-10-111-1/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-171-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-4/+6
| * | | | | | | | | mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+5