summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:41 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:41 -0700
commit8aed4a5e38a2a4f31567e01ab2a73341e972c08a (patch)
tree349cd09847bc932588ca38634b75a65846f82751 /merge-recursive.h
parent22ffc39a0332e892ddbf16b39d9b611aff238d9b (diff)
parent7610fa57e63b0acc0a66717fc2d85755634db591 (diff)
downloadgit-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.tar.gz
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 'merge-recursive.h')
-rw-r--r--merge-recursive.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 08f9850367..196f053106 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -14,6 +14,7 @@ struct merge_options {
} recursive_variant;
const char *subtree_shift;
unsigned buffer_output : 1;
+ unsigned renormalize : 1;
int verbosity;
int diff_rename_limit;
int merge_rename_limit;