[PATCH] Make git-diff documentation use [--] when it should.
- From
Brian Gernhardt <benji@silverinsanity.com>
- Date
- Dec 15, 2006, 12:39 UTC
- Message-ID
- <20061215123933.GB21322@162.242.249.10.in-addr.arpa>
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> --- 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 127d68c..10fdf88 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.
-- 1.4.4.1.GIT