Subject: Re: [PATCH 2/2] git-merge-recursive-{ours,theirs}

From: Jakub Narebski <[email-masked]>
Date: Sat, 21 Jun 2008 09:56:45 -0700 (PDT)

Junio C Hamano <[email-masked]> 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