git/Documentation, branch v2.10.2

Git 2.10.2

2016-10-28T16:02:44Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/pretty-format-color-doc-fix' into maint

2016-10-28T16:01:23Z

Small doc update. * rs/pretty-format-color-doc-fix: pretty: fix document link for color specification

Merge branch 'po/fix-doc-merge-base-illustration' into maint

2016-10-28T16:01:21Z

Some AsciiDoc formatter mishandles a displayed illustration with tabs in it. Adjust a few of them in merge-base documentation to work around them. * po/fix-doc-merge-base-illustration: doc: fix the 'revert a faulty merge' ASCII art tab spacing doc: fix merge-base ASCII art tab spacing

Merge branch 'bw/submodule-branch-dot-doc' into maint

2016-10-28T16:01:19Z

Recent git allows submodule..branch to use a special token "." instead of the branch name; the documentation has been updated to describe it. * bw/submodule-branch-dot-doc: submodules doc: update documentation for "." used for submodule branches

Merge branch 'sb/submodule-config-doc-drop-path' into maint

2016-10-28T16:01:16Z

The "submodule..path" stored in .gitmodules is never copied to .git/config and such a key in .git/config has no meaning, but the documentation described it and submodule..url next to each other as if both belong to .git/config. This has been fixed. * sb/submodule-config-doc-drop-path: documentation: improve submodule..{url, path} description

Merge branch 'nd/commit-p-doc' into maint

2016-10-28T16:01:15Z

Documentation for "git commit" was updated to clarify that "commit -p " adds to the current contents of the index to come up with what to commit. * nd/commit-p-doc: git-commit.txt: clarify --patch mode with pathspec

Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint

2016-10-28T16:01:10Z

Shorten description of auto-following in "git tag" by removing a mention of historical remotes layout which is not relevant to the main topic. * yk/git-tag-remove-mention-of-old-layout-in-doc: doc: remove reference to the traditional layout in git-tag.txt

doc: fix the 'revert a faulty merge' ASCII art tab spacing

2016-10-25T01:09:46Z

The asciidoctor doc-tool stack does not always respect the 'tab = 8 spaces' rule expectation, particularly for the Git-for-Windows generated html pages. This follows on from the 'doc: fix merge-base ASCII art tab spacing' fix. Use just spaces within the block of the ascii art. All other *.txt ascii art containing three dashes has been checked. Asciidoctor correctly formats the other art blocks that do contain tabs. Signed-off-by: Philip Oakley

doc: fix merge-base ASCII art tab spacing

2016-10-21T16:46:48Z

The doc-tool stack does not always respect the 'tab = 8 spaces' rule, particularly the git-scm doc pages https://git-scm.com/docs/git-merge-base and the Git generated html pages. Use just spaces within the block of the ascii art. Noticed when reviewing Junio's suggested update to `git merge-base` https://public-inbox.org/git/xmqqmvi2sj8f.fsf@gitster.mtv.corp.google.com/T/#u Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

doc: remove reference to the traditional layout in git-tag.txt

2016-10-20T16:31:42Z

This is the only place in the documentation that the traditional layout is mentioned, and it is confusing. Remove it. * Documentation/git-tag.txt: Here. Signed-off-by: Younes Khoudli Signed-off-by: Junio C Hamano