From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Aug 2007 15:23:00 GMT
Subject: Re: Add --rebase option to git-pull?
Message-ID: <Pine.LNX.4.64.0708301622240.28586@racer.site>
In-Reply-To: <550f9510708300810y1ca84e8dt4d0bab8fc99deb3c@mail.gmail.com>

Hi,

On Thu, 30 Aug 2007, Tom Clarke wrote:

> On 8/30/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > In my TODO, there is "add the 'rebase' strategy".  It is definitely
> > something post-1.5.3, so I do not look into it.  But the most logical
> > place for me would be to have a strategy 'rebase'.  IOW a
> > git-merge-rebase.sh.
> 
> The following is my first naive attempt, is this the kind of thing you
> were thinking of?

Looks good to me except for:

> +git update-index --refresh 2>/dev/null

Maybe a test case would be in order, too...

Thanks,
Dscho