From: Yin Ping <pkufranky@gmail.com>
Date: Sun, 28 Oct 2007 12:44:44 GMT
Subject: Re: How to merge git://repo.or.cz/git-gui into git.git
Message-ID: <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com>
In-Reply-To: <20071028111443.GA29183@xp.machine.xx>

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
>

3x. I have seen that subtree stategy is introduced in commit 68fa.
However, I don't find any description in manual of git-merge. Should
this be added to this manual or any other document?


-- 
franky