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:22:47 +0100 [thread overview]
Message-ID: <flpah7$beg$2@ger.gmane.org> (raw)
In-Reply-To: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>
> Hi Miklos,
>
> Here's another way that is perhaps a little cleaner:
>
> $ git remote add -f B /path/to/B
> $ git merge -s ours --no-commit B/master
> $ git read-tree --prefix=sub/ -u B/master
> $ git commit -m "subtree merged B"
>
hi sean,
that works perfectly but it doesn't preserve the history, does it?
dsp
next prev parent reply other threads:[~2008-01-06 1:25 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 [this message]
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
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='flpah7$beg$2@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).