Permalink
Browse files

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: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
marcows authored and gitster committed Jan 1, 2009
1 parent f296802 commit 3bc52d7a95676bcdeeb61c372b44358daf817baa
Showing with 2 additions and 2 deletions.
  1. +1 −1 Documentation/git-cherry.txt
  2. +1 −1 builtin-log.c
@@ -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
-----------
View
@@ -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;

0 comments on commit 3bc52d7

Please sign in to comment.