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

Use proper syntax for replaceables in command docs

2018-05-25T08:16:47Z

The standard for command documentation synopses appears to be: [...] means optional <...> means replaceable [<...>] means both optional and replaceable So fix a number of doc pages that use incorrect variations of the above. Signed-off-by: Robert P. J. Day Signed-off-by: Junio C Hamano

doc: normalize [--options] to [options] in git-diff

2018-05-06T09:38:43Z

SYNOPSIS and other manuals use [options] but DESCRIPTION used [--options]. Signed-off-by: Andreas Heiduk Signed-off-by: Junio C Hamano

doc: align 'diff --no-index' in text and synopsis

2018-05-06T09:38:43Z

Make the two '' parameters in DESCRIPTION mandatory and move the `--options` part to the same place where the other variants show them. And finally make `--no-index` in SYNOPSIS as mandatory as in DESCRIPTION. Signed-off-by: Andreas Heiduk Reviewed-by: Martin Ågren Signed-off-by: Junio C Hamano

diff-files: document --ours etc.

2017-04-13T23:15:25Z

git-diff understands "--ours", "--theirs" and "--base" for files with conflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk Signed-off-by: Junio C Hamano

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