From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: octopus limit Date: Fri, 27 Jun 2008 15:04:35 +0200 Message-ID: <20080627130435.GM29404@genesis.frugalware.org> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XMxQ/H8PTEmRgySH" Cc: Len Brown , git@vger.kernel.org To: Matthieu Moy X-From: git-owner@vger.kernel.org Fri Jun 27 15:05:58 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 1KCDeH-0005x9-C1 for gcvg-git-2@gmane.org; Fri, 27 Jun 2008 15:05:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755332AbYF0NEi (ORCPT ); Fri, 27 Jun 2008 09:04:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755270AbYF0NEi (ORCPT ); Fri, 27 Jun 2008 09:04:38 -0400 Received: from virgo.iok.hu ([193.202.89.103]:36057 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755171AbYF0NEh (ORCPT ); Fri, 27 Jun 2008 09:04:37 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 74B2F1B250E; Fri, 27 Jun 2008 15:04:36 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id 906C744668; Fri, 27 Jun 2008 14:38:01 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id D99B21778012; Fri, 27 Jun 2008 15:04:35 +0200 (CEST) Content-Disposition: inline In-Reply-To: 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: --XMxQ/H8PTEmRgySH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 27, 2008 at 08:33:37AM +0200, Matthieu Moy wrote: > There's a patch around which should remove this limitation (I think > it's the builtin-ification of merge). It's in 'pu', so in case you really need it *now*, then just get git.git and build the 'pu' branch. --XMxQ/H8PTEmRgySH Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhk5WMACgkQe81tAgORUJaSHwCeOShSrC2DjIBgzVngSaDGAHK2 daAAn3Mm3tWbk6ZeK+UBSB9bikgIgDOi =ndHe -----END PGP SIGNATURE----- --XMxQ/H8PTEmRgySH--