On Tue, Nov 24, 2009 at 6:08 PM, Nanako Shiraishi <nanako3@xxxxxxxxxxx> wrote: > Quoting Avery Pennarun <apenwarr@xxxxxxxxx> > >> Yup. This is basically a bug in "git merge -s subtree": it guesses >> which subtree to merge into, rather than actually taking a prefix >> parameter. I've been meaning to either submit a patch for this, or >> find a way to work around it. > > Probably you can save time by using what was already done > > http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=89021 Hi Nanako, I've read through the thread (I do remember skimming it awhile ago) but can't find patches for the syntax actually under discussion. I found a patch that introduces "-s theirs", which was summarily shot down in favour of adding -X support, but I can't find any actual patch for this. Moreover, git-merge seems to have been ported to C since then, so I guess it wouldn't apply anyway. And I can't find any implementation at all for the discussed "-Xsubtree=" option, which I'm guessing didn't actually ever get done. Am I missing something? It looks fairly easy to throw in anyway, but it's even easier if someone has already done it :) Thanks, Avery -- 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