From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relais.videotron.ca ([24.201.245.36]:28296 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972AbYBMFOt (ORCPT ); Wed, 13 Feb 2008 00:14:49 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN; charset=US-ASCII Date: Wed, 13 Feb 2008 00:14:41 -0500 (EST) From: Nicolas Pitre Subject: Re: Announce: Linux-next (Or Andrew's dream :-)) In-reply-to: Message-id: References: <47B1CB08.4020101@garzik.org> <20080212.155853.193190548.davem@davemloft.net> <20080212.172051.58554658.davem@davemloft.net> <1202869550.3137.182.camel@localhost.localdomain> <1202871616.3137.197.camel@localhost.localdomain> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Linus Torvalds Cc: James Bottomley , David Miller , jeff@garzik.org, arjan@infradead.org, greg@kroah.com, sfr@canb.auug.org.au, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org On Tue, 12 Feb 2008, Linus Torvalds wrote: > So let's say that you have a remote branch that you track that goes > rebasing (let's call it "origin/pu" to match the real-life git behaviour), > then you should literally be able to do > > old=$(git rev-parse origin/pu) && > git fetch && > new=$(git rev-parse origin/pu) && > git rebase --onto $new $old > > and no, I didn't actually test it, but hey, it really should be that > simple. Or, with Git 1.5.4, just: git pull --rebase And I didn't test it yet either. Same caveats do apply. Nicolas