Documentation: clarify which parameters are optional to git-cherry

marcows · gitster · commit 3bc52d7a9567 · 2009-01-05T11:43:28.000-08:00
An earlier parameter is only optional when all of the later parameters are
omitted.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@ static int add_pending_commit(const char arg, struct rev_info revs, int flags)`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`	`1073`	`static const char cherry_usage[] =`
`1074`		`-"git cherry [-v] [<upstream>] [<head>] [<limit>]";`
	`1074`	`+"git cherry [-v] [<upstream> [<head> [<limit>]]]";`
`1075`	`1075`	`int cmd_cherry(int argc, const char *argv, const char prefix)`
`1076`	`1076`	`{`
`1077`	`1077`	`struct rev_info revs;`