From: "Shawn O. Pearce" <spearce@spearce.org>
To: Yin Ping <pkufranky@gmail.com>
Cc: 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:52:17 -0400 [thread overview]
Message-ID: <20071030005217.GT14735@spearce.org> (raw)
In-Reply-To: <46dff0320710282345r2922ac7dj9c7a4eb3e20fd011@mail.gmail.com>
Yin Ping <pkufranky@gmail.com> wrote:
> On 10/28/07, Peter Baumann <waste.manager@gmx.de> wrote:
> >
> > Have a look at the subtree merge strategy [1] and at the following
> > explanations how git-gui got initally merged.
> >
> > -Peter
> >
> > [1]: http://www.gelato.unsw.edu.au/archives/git/0702/40139.html
> > [2]: http://www.gelato.unsw.edu.au/archives/git/0702/39661.html
>
> When i merged git.git into git-gui with subtree strategy, I found all
> histories of git.git merged into histories of git-gui (from 584
> history entries to 11985). Is it possible that only histories related
> to git-gui subdirectory in git.git(i.e. histories displayed by git-log
> git-gui) are merged into?
>
> 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. But yes,
when this happens the entire history of the pulled project (in the
above case git-gui) suddenly appears in the history of the parent
project (in this case git). If you don't want this to happen then
you need to make git-gui into a submodule. That has been talked
about being done, but hasn't happened yet in the main git repository.
git-gui is currently still being subtree merged in.
--
Shawn.
next prev parent reply other threads:[~2007-10-30 0:52 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 [this message]
2007-10-30 2:12 ` Yin Ping
2007-10-30 3:46 ` Junio C Hamano
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=20071030005217.GT14735@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=pkufranky@gmail.com \
--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).