Junio C Hamano <gitster@xxxxxxxxx> writes: > Actually, I think "git-merge-recursive-theirs" is a mistake. We should > bite the bullet and give "git-merge" an ability to pass backend specific > parameters to "git-merge-recursive". The new convention could be that > anything that begins with -X is passed to the backend. > > E.g. > > git merge -Xfavor=theirs foo > git merge -Xsubtree=/=gitk-git paulus Gaaah... only after reading it for third time I see that it isn't some funky "=/=" symbol, but subtree with grafing '/' in one side to 'gitk-git' subdirectory in other side. -- Jakub Narebski Poland ShadeHawk on #git -- 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
