Code

merge-recursive --renormalize
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 5 Aug 2010 11:32:41 +0000 (06:32 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Aug 2010 16:20:02 +0000 (09:20 -0700)
commit7610fa57e63b0acc0a66717fc2d85755634db591
tree068161cdd6ca96746439efda939c4d15beba190d
parentff8ba59e7b015ba96d6a3271000f16aa71dc4a6f
merge-recursive --renormalize

Teach "git merge-recursive" a --renormalize option to enable the
merge.renormalize configuration.  The --no-renormalize option can
be used to override it in the negative.

So in the future, you might be able to, e.g.:

git checkout -m -Xrenormalize otherbranch

or

git revert -Xrenormalize otherpatch

or

git pull --rebase -Xrenormalize

The bad part: merge.renormalize is still not honored for most
commands.  And it reveals lots of places that -X has not been plumbed
in (so we get "git merge -Xrenormalize" but not much else).

NEEDSWORK: tests

Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt
builtin/checkout.c
builtin/merge-recursive.c
builtin/merge.c
builtin/revert.c
cache.h
environment.c
merge-recursive.c