From: Nanako Shiraishi <nanako3@lavabit.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Marc Fournier <marc.fournier@camptocamp.com>, git@vger.kernel.org
Subject: Re: git-subtree: directory mismatch
Date: Wed, 25 Nov 2009 08:08:12 +0900 [thread overview]
Message-ID: <20091125080812.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <32541b130911241348s21e21fb8n12edf374e6a3c309@mail.gmail.com>
Quoting Avery Pennarun <apenwarr@gmail.com>
> 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/
next prev parent reply other threads:[~2009-11-24 23:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 19:53 git-subtree: directory mismatch Marc Fournier
2009-11-24 21:48 ` Avery Pennarun
2009-11-24 23:08 ` Nanako Shiraishi [this message]
2009-11-25 18:28 ` Avery Pennarun
2009-11-25 19:31 ` Junio C Hamano
2009-11-25 19:48 ` Avery Pennarun
2009-11-25 20:20 ` Junio C Hamano
2009-11-25 23:17 ` Johannes Schindelin
2009-11-25 23:20 ` Avery Pennarun
2009-11-25 23:41 ` Björn Steinbrink
2009-11-25 23:45 ` Avery Pennarun
2009-11-25 14:32 ` Marc Fournier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091125080812.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=marc.fournier@camptocamp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox