X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-recursive.c;h=78b9db76a0819529e7f6cab44319acd2978c9e9b;hb=9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e;hp=3d00adbfc79aa0d5e4e6b3367bc5b70f8df36857;hpb=e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9;p=git.git

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3d00adbfc..78b9db76a 100644
--- 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;