From: Henning Moll <newsScott@gmx.de>
To: git <git@vger.kernel.org>
Cc: Christian Couder <christian.couder@gmail.com>
Subject: Re: flatten-merge history
Date: Sun, 26 Oct 2014 15:36:50 +0100 [thread overview]
Message-ID: <544D0702.1050907@gmx.de> (raw)
In-Reply-To: <CAP8UFD3jyZ+7bk-xrE=TghzFj9UL=+Mtz-CvFWK9azNrRcOU5Q@mail.gmail.com>
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
next prev parent reply other threads:[~2014-10-26 14:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 12:31 flatten-merge history Henning Moll
2014-10-26 5:46 ` Christian Couder
2014-10-26 14:36 ` Henning Moll [this message]
2014-10-26 15:19 ` Andreas Schwab
2014-10-26 19:02 ` Christian Couder
2014-10-26 23:45 ` Henning Moll
2014-10-27 18:45 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=544D0702.1050907@gmx.de \
--to=newsscott@gmx.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.