Merge branch 'ks/recursive-rename-add-identical'

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

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3d00adbfc79aa0d5e4e6b3367bc5b70f8df36857..78b9db76a0819529e7f6cab44319acd2978c9e9b 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -48,6 +48,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;