From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH RFC] rebase: add --revisions flag Date: Tue, 8 Dec 2009 18:11:44 +0200 Message-ID: <20091208161142.GA32045@redhat.com> References: <20091208144740.GA30830@redhat.com> <20091208160822.GA1299@atjola.homenet> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org, Junio C Hamano To: =?iso-8859-1?Q?Bj=F6rn?= Steinbrink X-From: git-owner@vger.kernel.org Tue Dec 08 17:14:42 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NI2hx-0006Z4-6Z for gcvg-git-2@lo.gmane.org; Tue, 08 Dec 2009 17:14:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932479AbZLHQO0 convert rfc822-to-quoted-printable (ORCPT ); Tue, 8 Dec 2009 11:14:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932474AbZLHQOZ (ORCPT ); Tue, 8 Dec 2009 11:14:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20056 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932368AbZLHQOY (ORCPT ); Tue, 8 Dec 2009 11:14:24 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB8GERAC024685 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Dec 2009 11:14:28 -0500 Received: from redhat.com (vpn2-9-36.ams2.redhat.com [10.36.9.36]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB8GEPNQ007133; Tue, 8 Dec 2009 11:14:26 -0500 Content-Disposition: inline In-Reply-To: <20091208160822.GA1299@atjola.homenet> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Dec 08, 2009 at 05:08:22PM +0100, Bj=F6rn Steinbrink wrote: > On 2009.12.08 16:47:42 +0200, Michael S. Tsirkin wrote: > > Add --revisions flag to rebase, so that it can be used > > to apply an arbitrary range of commits on top > > of a current branch. > >=20 > > Signed-off-by: Michael S. Tsirkin > > --- > >=20 > > I've been wishing for this functionality for a while now, > > so here goes. This isn't yet properly documented and I didn't > > write a test, but the patch seems to work fine for me. > > Any early flames/feedback? >=20 > This pretty much reverses what rebase normally does. Instead of "reba= se > this onto that" it's "'rebase' that onto this". And instead of updati= ng > the branch head that got rebased, the, uhm, "upstream" gets updated. >=20 > Also, AFAICT this needs to be called like this: > git rebase --revisions foo..bar HEAD >=20 > Changing the meaning of the argument and relying on the fa= ct > that defaults to . If such a thing gets added, it > should rather work like --root, not using at all, but --on= to > only. Maybe defaulting to HEAD for and making --o= nto > optional, as it's reversed WRT what it does compared to the usual > rebase. Sorry, I had trouble parsing the above. Could you suggest e.g. how the help line should look? > But generally, I'd say it would be better to add such a range feature= to > cherry-pick than abusing rebase for that. >=20 > Bj=F6rn The reason to use rebase is that I often want to combine this with -i flag, editing patches as they are applied. --=20 MST