git/Documentation, branch v2.3.1

Git 2.3.1

2015-02-25T06:14:42Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-log-rev-list-options' into maint

2015-02-25T06:10:40Z

"git log --help" used to show rev-list options that are irrelevant to the "log" command. * jc/doc-log-rev-list-options: Documentation: what does "git log --indexed-objects" even mean?

Merge branch 'jc/diff-format-doc' into maint

2015-02-25T06:10:36Z

The documentation incorrectly said that C(opy) and R(ename) are the only ones that can be followed by the score number in the output in the --raw format. * jc/diff-format-doc: diff-format doc: a score can follow M for rewrite

Merge branch 'mg/push-repo-option-doc' into maint

2015-02-25T06:10:19Z

The "git push" documentation made the "--repo=" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo

Git 2.3

2015-02-05T21:23:56Z

Signed-off-by: Junio C Hamano

diff-format doc: a score can follow M for rewrite

2015-01-29T06:22:03Z

b6d8f309 (diff-raw format update take #2., 2005-05-23) started documenting the diff format, and it said ... (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". (9) status, followed by similarlity index number only for C and R. (10) a tab or a NUL when '-z' option is used. ... because C and R _were_ the only ones that came with a number back then. This was corrected by ddafa7e9 (diff-helper: Fix R/C score parsing under -z flag., 2005-05-29) and we started saying "score" instead of "similarlity index" (because we can have other kind of score there), and stopped saying "only for C and R" (because Git is an ever evolving system). Later f345b0a0 (Add -B flag to diff-* brothers., 2005-05-30) introduced a new concept, "dissimilarity" score; it did not have to fix any documentation. The current text that says only C and R can have scores came independently from a5a323f3 (Add reference for status letters in documentation., 2008-11-02) and it was wrong from the day one. Noticed-by: Mike Hommey Signed-off-by: Junio C Hamano

git-push.txt: document the behavior of --repo

2015-01-28T20:56:06Z

As per the code, the --repo option is equivalent to the argument to 'git push', but somehow it was documented as something that is more than that. [It exists for historical reasons, back from the time when options had to come before arguments.] Say so. [But not that.] Signed-off-by: Michael J Gruber Helped-by: Eric Sunshine Signed-off-by: Junio C Hamano

Documentation: what does "git log --indexed-objects" even mean?

2015-01-23T23:06:24Z

4fe10219 (rev-list: add --indexed-objects option, 2014-10-16) adds "--indexed-objects" option to "rev-list", and it is only useful in the context of "git rev-list" and not "git log". There are other object traversal options that do not make sense for "git log" that are shown in the manual page. Move the description of "--indexed-objects" to the object traversal section so that it sits together with its friends "--objects", "--objects-edge", etc. and then show them only in "git rev-list" documentation. Acked-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'sh/asciidoc-git-version-fix'

2015-01-22T21:44:47Z

* sh/asciidoc-git-version-fix: Documentation: fix version numbering

Documentation: fix version numbering

2015-01-22T21:44:14Z

Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a366 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: Sven van Haastregt Signed-off-by: Junio C Hamano