Andrew's git / gitweb.git / diff
?
Documentation: clarify which parameters are optional to git-cherry
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 1 Jan 2009 21:56:29 +0000 (22:56 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jan 2009 19:43:28 +0000 (11:43 -0800)
An earlier parameter is only optional when all of the later parameters are
omitted.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cherry.txt patch | blob | history
builtin-log.c patch | blob | history
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 556ea23cd96018bcf85102bdf82438baa61c2390..7deefdae8f995d843971f6beff24af8325b99f1f 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream
 
 SYNOPSIS
 --------
-'git cherry' [-v] [<upstream>] [<head>] [<limit>]
+'git cherry' [-v] [<upstream> [<head> [<limit>]]]
 
 DESCRIPTION
 -----------
diff --git a/builtin-log.c b/builtin-log.c
index 243f8573e48c46c94e68fbc280eb78666b812a98..7e9616e5e73aaaeaa4ff06feaf7ddfbd077923cf 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -1071,7 +1071,7 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
 }
 
 static const char cherry_usage[] =
-"git cherry [-v] [<upstream>] [<head>] [<limit>]";
+"git cherry [-v] [<upstream> [<head> [<limit>]]]";
 int cmd_cherry(int argc, const char **argv, const char *prefix)
 {
        struct rev_info revs;