diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2006-12-15 07:39:33 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-15 22:31:01 -0800 |
| commit | e697e4cd1fc492e312a396211bafc629d6297ebd (patch) | |
| tree | 81de4f5a0855699be0abf2b78ed4b2ea52f0af58 /Documentation/git-diff.txt | |
| parent | 89c4afe0d011b71d0bbcd9ad43f367f6a0dc3d83 (diff) | |
| download | git-e697e4cd1fc492e312a396211bafc629d6297ebd.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 127d68c962..10fdf88dce 100644 --- 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 -------- -'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...] +'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...] 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. -'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 @@ -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. -'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. |