From: Hans Ginzel Date: Sun, 01 Feb 2015 18:42:14 GMT Subject: How to rebase one branch of the merge commit? Message-ID: <20150201184214.GA89666@artax.karlin.mff.cuni.cz> 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