The SYNOPSIS lists the [--no-index] form as the last item, but the DESCRIPTION lists it as a natural extension of the first form. Fix this with a reordering. Also since the DESCRIPTION breaks up the first form in the SYNOPSIS into two different forms (one without the optional [<commit>], and the other with it), reorder to make these two forms appear together. Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> --- Documentation/git-diff.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 291e250..1f2f681 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -10,12 +10,12 @@ SYNOPSIS -------- [verse] 'git diff' [options] [<commit>] [[--] [<path>...]] +'git diff' [options] [--no-index] [[--] <path> <path>] 'git diff' [options] --cached [<commit>] [[--] [<path>...]] 'git diff' [options] <blob> <blob> 'git diff' [options] <commit> <commit> [[--] [<path>...]] 'git diff' [options] <commit>..<commit> [[--] [<path>...]] 'git diff' [options] <commit>\...<commit> [[--] [<path>...]] -'git diff' [options] [--no-index] [[--] <path> <path>] DESCRIPTION ----------- @@ -35,6 +35,14 @@ If exactly two paths are given and at least one points outside the current repository, 'git diff' will compare the two files / directories. This behavior can be forced by --no-index. +'git diff' [options] <commit> [[--] [<path>...]]:: + + This form is to view the changes you have in your + working tree relative to the named <commit>. You can + use HEAD to compare it with the latest commit, or a + branch name to compare with the tip of a different + branch. + 'git diff' [options] --cached [<commit>] [[--] [<path>...]]:: This form is to view the changes you staged for the next @@ -45,14 +53,6 @@ directories. This behavior can be forced by --no-index. <commit> is not given, it shows all staged changes. --staged is a synonym of --cached. -'git diff' [options] <commit> [[--] [<path>...]]:: - - This form is to view the changes you have in your - working tree relative to the named <commit>. You can - use HEAD to compare it with the latest commit, or a - branch name to compare with the tip of a different - branch. - 'git diff' [options] <blob> <blob>:: This form is to view the differences between the raw -- 1.8.2.1.502.g2d60b5c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html