From: Hans Ginzel <hans@matfyz.cz>
To: git@vger.kernel.org
Subject: How to rebase one branch of the merge commit?
Date: Sun, 1 Feb 2015 19:42:14 +0100 [thread overview]
Message-ID: <20150201184214.GA89666@artax.karlin.mff.cuni.cz> (raw)
Hello!
Suppose following git history:
A–M–C
/
B
How to achieve this with commits metadata preserving?
A–M'–C'
/
B'
I did
git checkout B
git add something_not_in_other_commits
git commit --amend
So I have B'. How to continue, please? My git version is 1.7.1 (Centos 6.5).
Regards
Hans
next reply other threads:[~2015-02-01 18:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-01 18:42 Hans Ginzel [this message]
2015-02-01 19:28 ` How to rebase one branch of the merge commit? Dennis Kaarsemaker
2015-02-09 11:38 ` Hans Ginzel
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=20150201184214.GA89666@artax.karlin.mff.cuni.cz \
--to=hans@matfyz.cz \
--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 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).