diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 20:39:38 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 20:39:38 +0400 |
| commit | 22ffc39a0332e892ddbf16b39d9b611aff238d9b (patch) | |
| tree | 90ed6d2bc6afd2a3867c2bdd770f951baa3014d6 /builtin | |
| parent | 4bf9dd97827bf6f475a52e8f621dad24a3db9b4c (diff) | |
| parent | dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff) | |
Sync with 1.7.2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -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]; |