From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists Date: Sun, 20 Jul 2008 20:50:05 +0200 Message-ID: <20080720185005.GN10347@genesis.frugalware.org> References: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org> <7vmykc76dn.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dUCTBDm4d+mXXNar" Cc: Nanako Shiraishi , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jul 20 20:51:13 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 1KKe00-0006at-Jh for gcvg-git-2@gmane.org; Sun, 20 Jul 2008 20:51:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750989AbYGTSuN (ORCPT ); Sun, 20 Jul 2008 14:50:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750736AbYGTSuM (ORCPT ); Sun, 20 Jul 2008 14:50:12 -0400 Received: from virgo.iok.hu ([193.202.89.103]:49076 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750695AbYGTSuL (ORCPT ); Sun, 20 Jul 2008 14:50:11 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 10E151B2524; Sun, 20 Jul 2008 20:50:08 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id 127394465E; Sun, 20 Jul 2008 20:10:22 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id B71D0177001C; Sun, 20 Jul 2008 20:50:05 +0200 (CEST) Content-Disposition: inline In-Reply-To: <7vmykc76dn.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: --dUCTBDm4d+mXXNar Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano wrote: > Good eyes, both of you. Will roll a die and commit one squashed, > creditting one of you at random ;-) I thought commit messages can have multiple Signed-off-by lines. ;-) --dUCTBDm4d+mXXNar Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkiDiN0ACgkQe81tAgORUJbjeQCdFWRk9V8EpjhDZ++hnIroEfJ1 uYMAn2QwGWEBjS5jBWk6jBBLXEftTFPO =N+ei -----END PGP SIGNATURE----- --dUCTBDm4d+mXXNar--