From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: git merge vs git commit Date: Tue, 9 Sep 2008 20:54:18 +0200 Message-ID: <20080909185418.GI4829@genesis.frugalware.org> References: <20080909165236.GA8850@flint.arm.linux.org.uk> <7vhc8p6x59.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eVzOFob/8UvintSX" Cc: Russell King , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Sep 09 20:55:01 2008 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 1Kd8Ma-0001jY-P9 for gcvg-git-2@gmane.org; Tue, 09 Sep 2008 20:54:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbYIISxt (ORCPT ); Tue, 9 Sep 2008 14:53:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753986AbYIISxt (ORCPT ); Tue, 9 Sep 2008 14:53:49 -0400 Received: from virgo.iok.hu ([193.202.89.103]:46471 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742AbYIISxs (ORCPT ); Tue, 9 Sep 2008 14:53:48 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id A74341B255D; Tue, 9 Sep 2008 20:53:46 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id 6E0374465E; Tue, 9 Sep 2008 20:53:46 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id EC253119019E; Tue, 9 Sep 2008 20:54:18 +0200 (CEST) Content-Disposition: inline In-Reply-To: <7vhc8p6x59.fsf@gitster.siamese.dyndns.org> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --eVzOFob/8UvintSX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Sep 09, 2008 at 10:34:42AM -0700, Junio C Hamano wrote: > I think some changes went into 1.6.0 around this area to (r)eject parents > that are redundant. Yes, it was your 98cf9c3 (Introduce reduce_heads(), 2008-06-27). --eVzOFob/8UvintSX Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkjGxloACgkQe81tAgORUJZ4IwCdGwarNOFON+9w0PcBPPAn1xEO t8wAn2dhvGN+9JaJSBHvEAInsU+RaIa1 =xusA -----END PGP SIGNATURE----- --eVzOFob/8UvintSX--