1. Stefan Saasen
  2. git


Thiago Farina  committed e78d01b

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>

  • Participants
  • Parent commits 22da742
  • Branches master

Comments (0)

Files changed (1)

File builtin/merge-recursive.c

View file
 #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];
 		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];