From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: q: faster way to integrate/merge lots of topic branches? Date: Wed, 23 Jul 2008 16:57:20 +0200 Message-ID: <20080723145720.GG32057@genesis.frugalware.org> References: <20080723130518.GA17462@elte.hu> <488734D9.9070703@op5.se> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="c/UxJciryulPFo89" Cc: Ingo Molnar , git@vger.kernel.org To: Andreas Ericsson X-From: git-owner@vger.kernel.org Wed Jul 23 16:59:16 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 1KLfo9-0003Lc-Qb for gcvg-git-2@gmane.org; Wed, 23 Jul 2008 16:59:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754593AbYGWO50 (ORCPT ); Wed, 23 Jul 2008 10:57:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754569AbYGWO5Z (ORCPT ); Wed, 23 Jul 2008 10:57:25 -0400 Received: from virgo.iok.hu ([193.202.89.103]:33315 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754558AbYGWO5Y (ORCPT ); Wed, 23 Jul 2008 10:57:24 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 8851A1B24EF; Wed, 23 Jul 2008 16:57:22 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id 4A2B64465E; Wed, 23 Jul 2008 16:16:00 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id 274E811909DE; Wed, 23 Jul 2008 16:57:20 +0200 (CEST) Content-Disposition: inline In-Reply-To: <488734D9.9070703@op5.se> 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: --c/UxJciryulPFo89 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jul 23, 2008 at 03:40:41PM +0200, Andreas Ericsson wrote: > With the builtin merge (which is in next) Just a small correction: it's already in master. --c/UxJciryulPFo89 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkiHRtAACgkQe81tAgORUJbU5gCdG+2x9QilPjGQDXqJyfzQYt0P n2UAn2cPGznYnf0ygeyemmRW4hEzP+Cn =sFbY -----END PGP SIGNATURE----- --c/UxJciryulPFo89--