Re: rebasing merges

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Sep 23, 2008, 08:00 UTC
Message-ID: <48D8A209.6090708@viscovery.net>
In-Reply-To: <20080923024653.a3bb8666.stephen@exigencecorp.com>

Stephen Haberman schrieb:

Show 11 quoted lines

>> This is the expected behavior and not up for debate.
> 
> Cool, thanks for the reply. However, I debate... :-)
> 
>>   ---o--o--o--o--o--o         <-- origin
>>                      \
>>                       A'--B'  <-- master
> 
> Nice. That makes sense in your scenario.
> 
> Here is mine:

I understand your problem very well. pull --rebase does not help your case because it was not designed for your workflow (it was designed to help the one that I sketched).

You are probably better served using fetch + rebase -i -p.

-- Hannes