diff options
| author | Thiago Farina <tfransosi@gmail.com> | 2010-08-30 07:30:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 20:37:10 +0400 |
| commit | e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9 (patch) | |
| tree | f9dc267857e5939b6179cd1b245968eb37ed4f81 | |
| parent | 22da742982eeeb95b6fb4cd757509a8c4c2202d8 (diff) | |
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>
| -rw-r--r-- | builtin/merge-recursive.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index d8875d5892..3d00adbfc7 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -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]; @@ -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]; |