Thiago Farina wrote:
> 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> ...
[...]
> --- 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> ...";
Now that you've researched it, wouldn't it make sense to include an
explanation for this %s in the log message?
Still, ack on this part.
> @@ -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"))
My comment on the rest still applies: it is best if patches do not
contain unrelated changes to unrelated parts of the files they touch.
--
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