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>
Thiago Farina committed
Aug 30, 2010 at 00:30 UTC
e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9
1 file changed
+4
-1
builtin/merge-recursive.c
+4
-1
@@ -3,6 +3,9 @@
3
#include "tag.h"
4
#include "merge-recursive.h"
5
6
+static const char builtin_merge_recursive_usage[] =
7
+ "git %s <base>... -- <head> <remote> ...";
8
+
9
static const char *better_branch_name(const char *branch)
10
{
11
static char githead_env[8 + 40 + 1];
@@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
32
o.subtree_shift = "";
33
34
if (argc < 4)
32
- usagef("%s <base>... -- <head> <remote> ...", argv[0]);
35
+ usagef(builtin_merge_recursive_usage, argv[0]);
36
37
for (i = 1; i < argc; ++i) {
38
const char *arg = argv[i];