Make git-diff documentation use [--] when it should.

Two of the cases has "[--] [<path>...]" and two had "-- [<path>...]".
Not terribly consistent and potentially confusing.  Also add "[--]" to
the synopsis so that it's obvious you can use it from the very
beginning.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 127d68c9620971be2854d42b7d5fbd0a6c85b356..10fdf88dce296f9fd7aea849b974cfbe709fa1b4 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree.
        would want comparison with the latest commit, so if you
        do not give <commit>, it defaults to HEAD.
 
        would want comparison with the latest commit, so if you
        do not give <commit>, it defaults to HEAD.
 

-'git-diff' [--options] <commit> -- [<path>...]::
+'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
 
        This form is to view the changes you have in your
        working tree relative to the named <commit>.  You can


@@ -38,7 +38,7 @@ tree and the index file, or the index file and the working tree.
        branch name to compare with the tip of a different
        branch.
 
        branch name to compare with the tip of a different
        branch.
 

-'git-diff' [--options] <commit> <commit> -- [<path>...]::
+'git-diff' [--options] <commit> <commit> [--] [<path>...]::

 
        This form is to view the changes between two <commit>,
        for example, tips of two branches.
 
        This form is to view the changes between two <commit>,
        for example, tips of two branches.