kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/merge_recursive.c: Add an usage string and make use of it. 

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>
maint
Thiago Farina 2010-08-30 00:30:22 -03:00 committed by Junio C Hamano
parent 22da742982
commit e78d01bf4e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/merge-recursive.c
View File

@ -3,6 +3,9 @@
#include "tag.h" #include "tag.h"
#include "merge-recursive.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 const char *better_branch_name(const char *branch)
{ {
static char githead_env[8 + 40 + 1]; static char githead_env[8 + 40 + 1];
@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.subtree_shift = ""; o.subtree_shift = "";


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


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