[PATCH] diff,difftool: Don't use the {0,2} notation in usage strings
- From
Štěpán Němec <stepnem@gmail.com>
- Date
- Nov 4, 2010, 17:18 UTC
- Message-ID
- <87hbfxgg86.fsf_-_@gmail.com>
- In-Reply-To
- <87fwvl2d4d.fsf@gmail.com>
This was the only occurence of that usage, and square brackets are sufficient and already well-established for that purpose.
Signed-off-by: Štěpán Němec <stepnem@gmail.com> ---
As per discussion upthread, this notation is not worth keeping; hence not mentioning it in the v2 of the CodingGuidlines patch and this removal.
Documentation/git-diff.txt | 2 +- Documentation/git-difftool.txt | 2 +- builtin/diff.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index dd1fb32..61728f6 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' [<common diff options>] <commit>{0,2} [--] [<path>...] +'git diff' [<common diff options>] [<commit> [<commit>]] [--] [<path>...] DESCRIPTION ----------- diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 8250bad..a02e3b5 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -7,7 +7,7 @@ git-difftool - Show changes using common diff tools SYNOPSIS -------- -'git difftool' [<options>] <commit>{0,2} [--] [<path>...] +'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...] DESCRIPTION ----------- diff --git a/builtin/diff.c b/builtin/diff.c index a43d326..945e758 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -22,7 +22,7 @@ struct blobinfo { }; static const char builtin_diff_usage[] = -"git diff <options> <rev>{0,2} -- <path>*"; +"git diff [<options>] [<commit> [<commit>]] [--] [<path>...]"; static void stuff_change(struct diff_options *opt, unsigned old_mode, unsigned new_mode,
-- 1.7.3.rc2.221.gbf93f.dirty