From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Yin Ping <pkufranky@gmail.com>,
Peter Baumann <waste.manager@gmx.de>,
git@vger.kernel.org
Subject: Re: How to merge git://repo.or.cz/git-gui into git.git
Date: Mon, 29 Oct 2007 20:46:50 -0700 [thread overview]
Message-ID: <7vmyu1s1qt.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071030005217.GT14735@spearce.org> (Shawn O. Pearce's message of "Mon, 29 Oct 2007 20:52:17 -0400")
"Shawn O. Pearce" <spearce@spearce.org> writes:
>> 2. pull with subtree strategy
>> ~/git-gui$ git-pull -s subtree git master:master
>
> You are merging in the wrong direction. You want to merge git-gui
> into git.git:
>
> git clone git://repo.or.cz/alt-git.git mygit
> cd mygit
> git pull -s subtree git://repo.or.cz/git-gui.git master
>
> So you are pulling git-gui into git, not the reverse.
Actually, subtree strategy was designed to allow merging back
and forth. But the result, as it _is_ a merge, will not omit
any commit from the history from both branches.
next prev parent reply other threads:[~2007-10-30 3:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-28 10:57 How to merge git://repo.or.cz/git-gui into git.git Yin Ping
2007-10-28 11:00 ` Yin Ping
2007-10-28 11:14 ` Peter Baumann
2007-10-28 12:44 ` Yin Ping
2007-10-28 18:13 ` Miklos Vajna
2007-10-29 6:45 ` Yin Ping
2007-10-30 0:52 ` Shawn O. Pearce
2007-10-30 2:12 ` Yin Ping
2007-10-30 3:46 ` Junio C Hamano [this message]
2007-10-30 8:51 ` Yin Ping
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=7vmyu1s1qt.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pkufranky@gmail.com \
--cc=spearce@spearce.org \
--cc=waste.manager@gmx.de \
/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).