Hi Thiago,
Thiago Farina wrote:
> This improves the usage output by adding builtin_merge_recursive_usage string
> that follows the same pattern used by the other builtin commands.
>
> Also it uses usage() function instead of the usagef() function.
FWIW cmd_merge_recursive is used to handle four different commands.
$ git grep -F -e cmd_merge_recursive
builtin.h:extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
builtin/merge-recursive.c:int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
git.c: { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
git.c: { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
git.c: { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
git.c: { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
What will be the output from
$ git merge-subtree -h
after this change?
> --- a/builtin/merge-recursive.c
> +++ b/builtin/merge-recursive.c
> @@ -37,19 +40,19 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
> if (!prefixcmp(arg, "--")) {
> if (!arg[2])
> break;
> - if (!strcmp(arg+2, "ours"))
> + if (!strcmp(arg + 2, "ours"))
Changes like these, while nice, would make more sense as a separate
patch.
Hope that helps,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html