From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 12 Feb 2009 20:37:38 GMT
Subject: Re: [RFC PATCH] Teach rebase to rebase even if upstream is up to date with -f
Message-ID: <alpine.DEB.1.00.0902122134500.10279@pacific.mpi-cbg.de>
In-Reply-To: <bd6139dc0902121230w1b9fec28sae4e14bdda58a50b@mail.gmail.com>

Hi,

On Thu, 12 Feb 2009, Sverre Rabbelier wrote:

> On Thu, Feb 12, 2009 at 21:28, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> > FWIW I typically use 'git rebase --whitespace=fix $(git merge-base
> > origin/master master)' for that, but that only works when there is a
> > single merge base.
> 
> Hehe, shouldof known there is an easier way to do it currently. Why
> does that work though?

It works because you are not rebasing onto 'master', but the merge base of 
'master' and your current branch.

So in contrast to the other situation, there are commits left to be 
rebased :-)

> Also, any comments on the patch? ;)

There is probably a thinko in it: if "master" already has your patches, 
then you cannot apply them on top of "master".  That should conflict 
rather horribly, and not change the commits that are already upstream.

Or I misunderstand something here.  Quite possible, I am pretty tired.

Ciao,
Dscho