Documentation: clarify which parameters are optional to git-cherry

An earlier parameter is only optional when all of the later parameters are omitted. Signed-off-by: N Junio C Hamano <gitster@pobox.com>

Documentation: clarify which parameters are optional to git-cherry
An earlier parameter is only optional when all of the later parameters are omitted. Signed-off-by: N Junio C Hamano <gitster@pobox.com>
3bc52d7a · Markus Heidelberg · Junio C Hamano · f2968022 · 3bc52d7a · 3bc52d7a
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Documentation/git-cherry.txt Documentation/git-cherry.txt +1 -1

builtin-log.c builtin-log.c +1 -1

未找到文件。
--- 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
 -----------

--- 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;