From: Ramkumar Ramachandra Date: Wed, 24 Apr 2013 16:33:36 GMT Subject: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form Message-ID: <1366821216-20868-6-git-send-email-artagnon@gmail.com> In-Reply-To: <1366821216-20868-1-git-send-email-artagnon@gmail.com> 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 [], and the other with it), reorder to make these two forms appear together. Signed-off-by: Ramkumar Ramachandra --- 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] [] [[--] [...]] +'git diff' [options] [--no-index] [[--] ] 'git diff' [options] --cached [] [[--] [...]] 'git diff' [options] 'git diff' [options] [[--] [...]] 'git diff' [options] .. [[--] [...]] 'git diff' [options] \... [[--] [...]] -'git diff' [options] [--no-index] [[--] ] 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] [[--] [...]]:: + + This form is to view the changes you have in your + working tree relative to the named . 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 [] [[--] [...]]:: 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. is not given, it shows all staged changes. --staged is a synonym of --cached. -'git diff' [options] [[--] [...]]:: - - This form is to view the changes you have in your - working tree relative to the named . 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] :: This form is to view the differences between the raw -- 1.8.2.1.502.g2d60b5c