diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:13:49 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:00 -0700 |
| commit | 3e7589b7b3ff7a7aa93bec39c40603e370c51317 (patch) | |
| tree | 4df3a2089810c1e43f939a12c593bd0635084fa8 /git-cvsserver.perl | |
| parent | t6038 (merge.renormalize): check that it can be turned off (diff) | |
| download | tgif-3e7589b7b3ff7a7aa93bec39c40603e370c51317.tar.xz | |
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 'git-cvsserver.perl')
0 files changed, 0 insertions, 0 deletions