Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH/RFC eb/double-convert-before-merge 0/6] merge -Xrenormalize

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:14

Jonathan Nieder [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help