From: Ramkumar Ramachandra Date: Wed, 24 Apr 2013 16:33:32 GMT Subject: [PATCH 1/5] git-diff.txt: reorder the form Message-ID: <1366821216-20868-2-git-send-email-artagnon@gmail.com> In-Reply-To: <1366821216-20868-1-git-send-email-artagnon@gmail.com> In DESCRIPTION, the '..' form refers to "the previous form", namely the ' ' form. However, bd52900 (Documentation: Describe "git diff " separately, 2012-12-18) broke this by inserting a form in between these two forms. Fix this by reordering a form. Signed-off-by: Ramkumar Ramachandra --- Documentation/git-diff.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index a7b4620..8623867 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -11,8 +11,8 @@ SYNOPSIS [verse] 'git diff' [options] [] [--] [...] 'git diff' [options] --cached [] [--] [...] -'git diff' [options] [--] [...] 'git diff' [options] +'git diff' [options] [--] [...] 'git diff' [options] [--no-index] [--] DESCRIPTION @@ -51,16 +51,16 @@ directories. This behavior can be forced by --no-index. branch name to compare with the tip of a different branch. -'git diff' [--options] [--] [...]:: - - This is to view the changes between two arbitrary - . - 'git diff' [options] :: This form is to view the differences between the raw contents of two blob objects. +'git diff' [--options] [--] [...]:: + + This is to view the changes between two arbitrary + . + 'git diff' [--options] .. [--] [...]:: This is synonymous to the previous form. If on -- 1.8.2.1.502.g2d60b5c