From 3bc52d7a95676bcdeeb61c372b44358daf817baa Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Thu, 1 Jan 2009 22:56:29 +0100 Subject: [PATCH] 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 --- Documentation/git-cherry.txt | 2 +- builtin-log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 556ea23cd9..7deefdae8f 100644 --- 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] [] [] [] +'git cherry' [-v] [ [ []]] DESCRIPTION ----------- diff --git a/builtin-log.c b/builtin-log.c index 243f8573e4..7e9616e5e7 100644 --- 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] [] [] []"; +"git cherry [-v] [ [ []]]"; int cmd_cherry(int argc, const char **argv, const char *prefix) { struct rev_info revs; -- 2.11.4.GIT