Skip to content

Commit

Permalink
diff,difftool: Don't use the {0,2} notation in usage strings
Browse files Browse the repository at this point in the history
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>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Štěpán Němec authored and Junio C Hamano committed Nov 5, 2010
1 parent c455bd8 commit 9edb8a0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion 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' [<common diff options>] <commit>{0,2} [--] [<path>...]
'git diff' [<common diff options>] [<commit> [<commit>]] [--] [<path>...]

DESCRIPTION
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-difftool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------
Expand Down
2 changes: 1 addition & 1 deletion builtin/diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9edb8a0

Please sign in to comment.