Skip to content

Commit

Permalink
Make git-diff documentation use [--] when it should.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Dec 16, 2006
1 parent 89c4afe commit e697e4c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc

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

DESCRIPTION
-----------
Expand All @@ -30,15 +30,15 @@ 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.

'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
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] <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.
Expand Down

0 comments on commit e697e4c

Please sign in to comment.