Re: [PATCH 1/3] Prepare for non-interactive merge-preserving rebase

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Sep 24, 2008, 06:17 UTC
Message-ID: <48D9DB66.3010501@viscovery.net>
In-Reply-To: <20080924001027.GA19264@neumann>

SZEDER Gábor schrieb:

Show 5 quoted lines

>   -A---B      master
>     \
>      C---M    topic
>       \ /
>        D

...

Show 17 quoted lines

> If I now execute 'git rebase -p master topic', I get the following:
> 
>   -A---B            master
>     \   \
>      \   C'---M'    topic
>       \      /
>        C----D
> 
> But I would rather like to have the following:
> 
>   -A---B            master
>         \
>          C'---M'    topic
>           \  /
>            D'
> 
> Would such a behaviour possible at all?

I think that rebase -i -p was meant to deal only with the situation where the merged-in branch is from outside the topic branch. What you want is called "git-sequencer". Search the archives.

-- Hannes