Skip to content

Commit

Permalink
builtin/merge_recursive.c: Add an usage string and make use of it.
Browse files Browse the repository at this point in the history
This improves the usage output by adding builtin_merge_recursive_usage string
that follows the same pattern used by the other builtin commands.

The previous output for git merger-recursive was:
usage: merge-recursive <base>... -- <head> <remote> ...

Now the output is:
usage: git merge-recursive <base>... -- <head> <remote> ...

Since cmd_merge_recursive is used to handle four different commands we need
the %s in the usage string, so the following example:

$ git merge-subtree -h

Will output:
usage: git merge-subtree <base>... -- <head> <remote> ...

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Thiago Farina authored and Junio C Hamano committed Sep 3, 2010
1 parent 22da742 commit e78d01b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion builtin/merge-recursive.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#include "tag.h"
#include "merge-recursive.h"

static const char builtin_merge_recursive_usage[] =
"git %s <base>... -- <head> <remote> ...";

static const char *better_branch_name(const char *branch)
{
static char githead_env[8 + 40 + 1];
Expand All @@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.subtree_shift = "";

if (argc < 4)
usagef("%s <base>... -- <head> <remote> ...", argv[0]);
usagef(builtin_merge_recursive_usage, argv[0]);

for (i = 1; i < argc; ++i) {
const char *arg = argv[i];
Expand Down

0 comments on commit e78d01b

Please sign in to comment.