[PATCH next] git-cherry usage: correct nesting of commit-ish options
- From
Markus Heidelberg <markus.heidelberg@web.de>
- Date
- Jan 4, 2009, 16:11 UTC
- Message-ID
- <200901041711.23026.markus.heidelberg@web.de>
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> ---
What is the preferred way to say the patch is against next? In the subject like this? Another question: should this patch be split up into two, one for maint/master and another for next?
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 556ea23..7deefda 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] [<upstream>] [<head>] [<limit>] +'git cherry' [-v] [<upstream> [<head> [<limit>]]] DESCRIPTION ----------- diff --git a/builtin-log.c b/builtin-log.c index 243f857..7e9616e 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] [<upstream>] [<head>] [<limit>]"; +"git cherry [-v] [<upstream> [<head> [<limit>]]]"; int cmd_cherry(int argc, const char **argv, const char *prefix) { struct rev_info revs;
-- 1.6.1.35.g0c23