Subject: Re: flatten-merge history

From: Henning Moll <[email-masked]>
Date: Sun, 26 Oct 2014 15:36:50 +0100

Am 26.10.2014 um 06:46 schrieb Christian Couder:
> Hi,Could you tell us why interactive rebase did not work?

First of all i have to admit that i did not i-rebase-merge, but 
i-rebase-cherrypick. Now i tried it with i-rebase-merge and it didn't 
work either.
Here's my workflow, which i repeated for all commits of 'extern' (in 
chronological order'). For simplicity let's assume that there is a 
parent commit for 'A'

1. For P, A is the nearest prior commit on 'master'
2. on master: git rebase -i A^
3. change A from pick to edit. save. quit
4. git merge P
5. git rebase --continue

 From the perspective of 'master' this worked. But as all of the commits 
have been rewritten, the branches b1 and b2 no longer refer to 'master'. 
Branch b2, for example, still branches off at B and not B'. So after 
this action, my history looks like this:

     P - - - Q - - - - - R       <-extern
       \
A'- m - B'- - - C'- D'- - - E'  <-master

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

A and A' are nearly the same: they only differ in the new 
GIT_COMITTER_DATE.
Now this is what i try to get (after only applying P):

     P - - - Q - - - - - R       <-extern
     \
A'- m - B'- - - C'- D'- - - E'  <-master
          \           \
           M'...       \         <-b1
                        \
                         W'...   <-b2

Regards
Henning