From e697e4cd1fc492e312a396211bafc629d6297ebd Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 15 Dec 2006 07:39:33 -0500 Subject: [PATCH] Make git-diff documentation use [--] when it should. Two of the cases has "[--] [...]" and two had "-- [...]". 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 Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 127d68c96..10fdf88dc 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 ] {0,2} [...] +'git-diff' [ --diff-options ] {0,2} [--] [...] 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 , it defaults to HEAD. -'git-diff' [--options] -- [...]:: +'git-diff' [--options] [--] [...]:: This form is to view the changes you have in your working tree relative to the named . 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] -- [...]:: +'git-diff' [--options] [--] [...]:: This form is to view the changes between two , for example, tips of two branches. -- 2.30.2