Re: flatten-merge history

From: Henning Moll <newsscott@gmx.de>
Date: Oct 26, 2014, 23:45 UTC
Message-ID: <544D878D.6020809@gmx.de>
In-Reply-To: <CAP8UFD2yjXC6ffCQyTvYNZZ00Ou=YmNgyWxGhbO29nbTHXRD5w@mail.gmail.com>

Am 26.10.2014 um 20:02 schrieb Christian Couder:

> Yeah. Henning, when interactively rebasing, in our editor, you should 
> have something like: pick A pick P pick B pick Q pick C pick D pick R 
> pick E which should work without any conflict. And then you can rebase 
> the b1 and b2 branches on the resulting branch.

Thank you all very much. It worked!

I didn't know that i could also introduce new commits in the interactive rebase list. Just for the record, in case others need to do such a task:

intial situation:

     P - - - Q - - - - - R       <-extern

A - - - B - - - C - D - - - E   <-master
          \           \
           M ...       \         <-b1
                        \
                         W ...   <-b2

On master: $ git rebase -i --root

(editor opens showing

pick A pick B pick C pick D pick E

modify this to

pick A pick P pick B pick Q pick C pick D pick R pick E

save, quit. Now, master is already fixed. Now fix the branches:

$ git rebase --onto B' B b1 $ git rebase --onto D' D b2

Just a final question: Is it possible to keep the GIT_COMMITTER_DATE in all those rebases?

Thanks again Henning