git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Soria Parra <sn_@gmx.net>
To: git@vger.kernel.org
Subject: Re: how to use git merge -s subtree?
Date: Sun, 06 Jan 2008 02:20:05 +0100	[thread overview]
Message-ID: <flpac6$beg$1@ger.gmane.org> (raw)
In-Reply-To: <20080105230004.GY29972@genesis.frugalware.org>

As said in IRC, subtree is not made for that as far is a understand.

Quite frankly the given workflow doesnot work for me as subtree imports
the things into some directory that it was not supposed to merge it into
(x/z/ instead of B).

                              dsp

      parent reply	other threads:[~2008-01-06  1:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-05 23:00 how to use git merge -s subtree? Miklos Vajna
2008-01-06  1:17 ` Sean
2008-01-06  1:22   ` David Soria Parra
2008-01-06  2:13     ` Sean
2008-01-06  2:28       ` David Soria Parra
2008-01-06  2:42         ` Junio C Hamano
2008-01-06  8:06           ` Sean
2008-01-07 21:04             ` Junio C Hamano
2008-01-08  5:34               ` Sean
2008-01-08  6:57                 ` Junio C Hamano
2008-01-06  3:45   ` Miklos Vajna
2008-01-06  1:20 ` David Soria Parra [this message]

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='flpac6$beg$1@ger.gmane.org' \
    --to=sn_@gmx.net \
    --cc=git@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).