summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŠtěpán Němec <stepnem@gmail.com>2010-11-04 17:18:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-05 17:05:31 (GMT)
commit9edb8a0f7b3e2ca06b360abce2e2aaa2b5760a68 (patch)
tree65d5e4b8eef63a5c84e656610901fc91197aed1a
parentc455bd8950e0e5593949b746ad96d1449bbbf9d5 (diff)
downloadgit-9edb8a0f7b3e2ca06b360abce2e2aaa2b5760a68.zip
git-9edb8a0f7b3e2ca06b360abce2e2aaa2b5760a68.tar.gz
git-9edb8a0f7b3e2ca06b360abce2e2aaa2b5760a68.tar.bz2
diff,difftool: Don't use the {0,2} notation in usage strings
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>
-rw-r--r--Documentation/git-diff.txt2
-rw-r--r--Documentation/git-difftool.txt2
-rw-r--r--builtin/diff.c2
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,