From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 04 Aug 2010 18:10:51 GMT
Subject: Re: [PATCH/RFC eb/double-convert-before-merge 0/6] merge -Xrenormalize
Message-ID: <7v39uugses.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100804031935.GA19699@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> But for later, they tell a nice story.  The idea is that the
> "merge.renormalize" is not really about the behavior of the "git
> merge" command but about the merge-recursive driver; and so it
> should be usable everywhere else that driver is used, too.
> ...
> So in an ideal world, you would be able to, e.g.:
>
> 	git checkout -m -Xrenormalize otherbranch
>
> or
>
> 	git revert -Xrenormalize otherpatch
>
> or
>
> 	git pull --rebase -Xrenormalize
>
> Of course, the plumbing is not all there yet; many commands that
> use merge drivers cannot pass through arbitrary options through
> yet.
>
> Well, enough talking.  Here are the patches; what do you think?

Nicely summarized.