summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 11:13:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-06 16:20:00 (GMT)
commit3e7589b7b3ff7a7aa93bec39c40603e370c51317 (patch)
tree4df3a2089810c1e43f939a12c593bd0635084fa8 /merge-recursive.h
parentbeeeb45493332f38de2a3b58120c5bebb5863577 (diff)
downloadgit-3e7589b7b3ff7a7aa93bec39c40603e370c51317.zip
git-3e7589b7b3ff7a7aa93bec39c40603e370c51317.tar.gz
git-3e7589b7b3ff7a7aa93bec39c40603e370c51317.tar.bz2
merge-trees: push choice to renormalize away from low level
The merge machinery decides whether to resmudge and clean relevant entries based on the global merge_renormalize setting, which is set by "git merge" based on its configuration (and left alone by other commands). A nicer interface would make that decision a parameter to merge_trees so callers would pass in a choice made on a call-by-call basis. Start by making blob_unchanged stop examining the merge_renormalize global. In other words, this change is a trivial no-op, but it brings us closer to something good. 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')
0 files changed, 0 insertions, 0 deletions