merge-recursive --renormalize

[git.git] / builtin / merge-recursive.c

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index d8875d589240e0c78a9e241a7d2bdde1d10ab800..c2d4677fd3db9b4e1360e0c45fdd2d4a110b5629 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -45,6 +45,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                                o.subtree_shift = "";
                        else if (!prefixcmp(arg+2, "subtree="))
                                o.subtree_shift = arg + 10;
+                       else if (!strcmp(arg+2, "renormalize"))
+                               o.renormalize = 1;
+                       else if (!strcmp(arg+2, "no-renormalize"))
+                               o.renormalize = 0;
                        else
                                die("Unknown option %s", arg);
                        continue;