From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: How to merge git://repo.or.cz/git-gui into git.git Date: Sun, 28 Oct 2007 19:13:05 +0100 Message-ID: <20071028181305.GL23810@genesis.frugalware.org> References: <46dff0320710280357u23927960hd204760b3d664ce2@mail.gmail.com> <46dff0320710280400v523e2130nd3286a88a4920a9c@mail.gmail.com> <20071028111443.GA29183@xp.machine.xx> <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZjlDoLon7m/fln42" Cc: Peter Baumann , git@vger.kernel.org To: Yin Ping X-From: git-owner@vger.kernel.org Sun Oct 28 19:13:31 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1ImCdb-0006Vx-2S for gcvg-git-2@gmane.org; Sun, 28 Oct 2007 19:13:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756970AbXJ1SNL (ORCPT ); Sun, 28 Oct 2007 14:13:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755690AbXJ1SNL (ORCPT ); Sun, 28 Oct 2007 14:13:11 -0400 Received: from virgo.iok.hu ([193.202.89.103]:40296 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756970AbXJ1SNJ (ORCPT ); Sun, 28 Oct 2007 14:13:09 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 8BBAD1B250E; Sun, 28 Oct 2007 19:13:06 +0100 (CET) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id 4471D44659; Sun, 28 Oct 2007 19:12:44 +0100 (CET) Received: by genesis.frugalware.org (Postfix, from userid 1000) id 2DCAD13A4025; Sun, 28 Oct 2007 19:13:05 +0100 (CET) Content-Disposition: inline In-Reply-To: <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com> User-Agent: Mutt/1.5.13cvs-muttng-frugalware (2007-01-09) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --ZjlDoLon7m/fln42 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --ZjlDoLon7m/fln42 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFHJNExe81tAgORUJYRAip9AKCfnKF5q8DsmvaTgBxla7P6hfXexwCgmaO+ ntCKphS+yZNkHIv6i7Hgw/0= =c//G -----END PGP SIGNATURE----- --ZjlDoLon7m/fln42--