git/Documentation/git-diff.txt, branch v2.5.2

Documentation: fix misuses of "nor"

2014-03-31T22:16:22Z

Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano

Documentation: fix typos in man pages

2014-02-05T22:35:45Z

Signed-off-by: Øystein Walle Signed-off-by: Junio C Hamano

diff --no-index: describe in a separate paragraph

2013-08-28T22:17:18Z

The documentation for "diff-files" mode of "git diff" primarily talks about how changes in the files in the working tree are shown relative to the contents previously added to that index, and tucks explanation on how "--no-index" mode, which works in a quite different way, may be implicitly used instead. Instead, add a separate paragraph to explain what "--no-index" mode does, and also mention when "--no-index" can be omitted from the command line (essentially, when it is obvious from the context). Signed-off-by: Junio C Hamano

diff --no-index: clarify operation when not inside a repository

2013-08-22T20:55:28Z

Clarify documentation for "diff --no-index". State that when not inside a repository, --no-index is implied and two arguments are mandatory. Clarify error message from diff-no-index to inform user that CWD is not inside a repository and thus two arguments are mandatory. Signed-off-by: Dale Worley Signed-off-by: Junio C Hamano

Merge branch 'kb/diff-blob-blob-doc' into maint

2013-07-22T05:51:37Z

* kb/diff-blob-blob-doc: Documentation: Move "git diff "

Documentation: Move "git diff "

2013-06-18T16:33:12Z

The section describing "git diff " had been placed in a position that disrupted the statement "This is synonymous to the previous form". Reorder to place this form after all the -using forms, and the note applying to them. Also mention this form in the initial description paragraph. Signed-off-by: Kevin Bracey Signed-off-by: Junio C Hamano

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Documentation: Describe "git diff " separately

2012-12-18T19:35:28Z

As it was not a common operation, it was described as if it is a side note for the more common two-commit variant, but this mode behaves very differently, e.g. it does not make any sense to ask recursive behaviour, or give the command a pathspec. Signed-off-by: Junio C Hamano

doc: drop author/documentation sections from most pages

2011-03-11T15:59:16Z

The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage.

diff: support --cached on unborn branches

2011-02-07T23:04:30Z

"git diff --cached" (without revision) used to mean "git diff --cached HEAD" (i.e. the user was too lazy to type HEAD). This "correctly" failed when there was no commit yet. But was that correctness useful? This patch changes the definition of what particular command means. It is a request to show what _would_ be committed without further "git add". The internal implementation is the same "git diff --cached HEAD" when HEAD exists, but when there is no commit yet, it compares the index with an empty tree object to achieve the desired result. Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano