From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2007 03:46:50 GMT
Subject: Re: How to merge git://repo.or.cz/git-gui into git.git
Message-ID: <7vmyu1s1qt.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20071030005217.GT14735@spearce.org>

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