Re: [PATCH v2] builtin/merge_recursive.c: Add an usage string and make use of it.
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:24
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> ...
[...]
quoted hunk ↗ jump to hunk
--- 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.
quoted hunk ↗ jump to hunk
@@ -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.