summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c455bd8)
raw | patch | inline | side by side (parent: c455bd8)
author | Štěpán Němec <stepnem@gmail.com> | |
Thu, 4 Nov 2010 17:18:17 +0000 (18:18 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Nov 2010 17:05:31 +0000 (10:05 -0700) |
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>
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>
Documentation/git-diff.txt | patch | blob | history | |
Documentation/git-difftool.txt | patch | blob | history | |
builtin/diff.c | patch | blob | history |
index dd1fb32786f6f467a1c46f2643fbc54d0390f2ec..61728f69745fd454232006962bfd51ee663c8ed4 100644 (file)
SYNOPSIS
--------
-'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
+'git diff' [<common diff options>] [<commit> [<commit>]] [--] [<path>...]
DESCRIPTION
-----------
index 8250bad2ce95245ca8e2a41c0740d0029b92ae4b..a02e3b5190260cc8f5c72d195ff8fe5afa6cd29a 100644 (file)
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 a43d3263638daf083c52f37f3bd0872327d7459b..945e7583a8294f0612682f3228687498e5c61822 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
};
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,