summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 11:15:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-06 16:20:00 (GMT)
commit1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4 (patch)
treee342fb1ebe7e0d14874ae0b02033640dfa23793d /Documentation/technical
parent3e7589b7b3ff7a7aa93bec39c40603e370c51317 (diff)
downloadgit-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.zip
git-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.gz
git-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.bz2
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 'Documentation/technical')
0 files changed, 0 insertions, 0 deletions