From: Andreas Schwab <schwab@linux-m68k.org>
To: Henning Moll <newsScott@gmx.de>
Cc: git <git@vger.kernel.org>, Christian Couder <christian.couder@gmail.com>
Subject: Re: flatten-merge history
Date: Sun, 26 Oct 2014 16:19:03 +0100 [thread overview]
Message-ID: <8761f65060.fsf@igel.home> (raw)
In-Reply-To: <544D0702.1050907@gmx.de> (Henning Moll's message of "Sun, 26 Oct 2014 15:36:50 +0100")
Henning Moll <newsScott@gmx.de> writes:
> 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'.
You only rebased master, so b1 and b2 were unchanged. If you want to
change b1 and b2 you have to rebase them as well.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2014-10-26 15:19 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
2014-10-26 15:19 ` Andreas Schwab [this message]
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=8761f65060.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=newsScott@gmx.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).