Andrew's git / gitweb.git / blobdiff
?
Fix git-apply with -p greater than 1
[gitweb.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index c2d4677fd3db9b4e1360e0c45fdd2d4a110b5629..78b9db76a0819529e7f6cab44319acd2978c9e9b 100644 (file)
--- 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];