Jonathan Nieder <jrnieder@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html