Subject: Re: How to rebase one branch of the merge commit?

From: Dennis Kaarsemaker <[email-masked]>
Date: Sun, 01 Feb 2015 20:28:28 +0100

On zo, 2015-02-01 at 19:42 +0100, Hans Ginzel wrote:
> 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).

Assuming you have a branch pointing to C and no uncommitted changes:

1) git checkout branch-that-points-to-c
2) git rev-parse branch-that-point-to-c
3) git reset --hard A
4) git merge B'
5) git cherry-pick sha1-that-was-the-output-of-step-2

-- 
Dennis Kaarsemaker
www.kaarsemaker.net