From: Nanako Shiraishi Date: Tue, 24 Nov 2009 23:08:12 GMT Subject: Re: git-subtree: directory mismatch Message-ID: <20091125080812.6117@nanako3.lavabit.com> In-Reply-To: <32541b130911241348s21e21fb8n12edf374e6a3c309@mail.gmail.com> Quoting Avery Pennarun > 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 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/