Re: How to merge git://repo.or.cz/git-gui into git.git

From: Yin Ping <pkufranky@gmail.com>
Date: Oct 30, 2007, 02:12 UTC
Message-ID: <46dff0320710291912p36d7c83j8564ff0afc6c7b79@mail.gmail.com>
In-Reply-To: <20071030005217.GT14735@spearce.org>

Show 18 quoted lines

> 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.
>

Ok, I see. I'm just be interested in the subtree strategy and try a few ways and different directions to merge. And also i'm trying to figure out which one of subtree merge and submodule is more suitable for my project. However, the conclusion havn't come.

-- 
franky