summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 06:15:32 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-06 09:20:00 -0700
commit1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4 (patch)
treee342fb1ebe7e0d14874ae0b02033640dfa23793d /merge-recursive.h
parent3e7589b7b3ff7a7aa93bec39c40603e370c51317 (diff)
downloadgit-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.gz
merge-trees: let caller decide whether to renormalize
Add a "renormalize" option to struct merge_options so callers can decide on a case-by-case basis whether the merge is likely to have overlapped with a change in smudge/clean rules. The option defaults to the global merge_renormalize setting for now. No change in behavior intended. Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 b831293b38..c5fbe796bb 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;