From: Miklos Vajna Date: Sun, 28 Oct 2007 18:13:05 GMT Subject: Re: How to merge git://repo.or.cz/git-gui into git.git Message-ID: <20071028181305.GL23810@genesis.frugalware.org> In-Reply-To: <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com> On Sun, Oct 28, 2007 at 08:44:44PM +0800, Yin Ping wrote: > 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? i think the git-merge manpage should mention it. - VMiklos