Skip to content

Commit

Permalink
Documentation: clarify which parameters are optional to git-cherry
Browse files Browse the repository at this point in the history
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 5, 2009
1 parent f296802 commit 3bc52d7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-cherry.txt
Expand Up @@ -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
-----------
Expand Down
2 changes: 1 addition & 1 deletion builtin-log.c
Expand Up @@ -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;
Expand Down

0 comments on commit 3bc52d7

Please sign in to comment.