Pieter de Bie <frimmirf@xxxxxxxxx> writes: > On 5 jul 2008, at 15:32, Miklos Vajna wrote: > >> As a user I would think that it tells git-merge to first try >> 'recursive' >> then 'theirs'. >> > > I agree with this. Perhaps there's an easy fix: how about a colon? > > git pull -s recursive:theirs > > might be more intuitive? How would you do the equivalent of git pull -s recursive -Xsubtree="My Playpen/" -Xours with the syntax? Note that the current scripted "pull" and "merge" has a limitation that it does not allow $IFS in -X<option> but that is not a designed-in limitation but purely comes from a lazy implementation . Also I do not see why -X<option> is not easy with parseopt() as Dscho claimed in the original message in this thread... -- 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
