summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 16:43:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-03 16:43:41 (GMT)
commit8aed4a5e38a2a4f31567e01ab2a73341e972c08a (patch)
tree349cd09847bc932588ca38634b75a65846f82751 /builtin/merge-recursive.c
parent22ffc39a0332e892ddbf16b39d9b611aff238d9b (diff)
parent7610fa57e63b0acc0a66717fc2d85755634db591 (diff)
downloadgit-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.zip
git-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.tar.gz
git-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.tar.bz2
Merge branch 'jn/merge-renormalize'
* jn/merge-renormalize: merge-recursive --renormalize rerere: never renormalize rerere: migrate to parse-options API t4200 (rerere): modernize style ll-merge: let caller decide whether to renormalize ll-merge: make flag easier to populate Documentation/technical: document ll_merge merge-trees: let caller decide whether to renormalize merge-trees: push choice to renormalize away from low level t6038 (merge.renormalize): check that it can be turned off t6038 (merge.renormalize): try checkout -m and cherry-pick t6038 (merge.renormalize): style nitpicks Don't expand CRLFs when normalizing text during merge Try normalizing files to avoid delete/modify conflicts when merging Avoid conflicts when merging branches with mixed normalization Conflicts: builtin/rerere.c t/t4200-rerere.sh
Diffstat (limited to 'builtin/merge-recursive.c')
-rw-r--r--builtin/merge-recursive.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3d00adb..78b9db7 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;