Point branch to new commit

Question

(This question is the opposite of this one)

How can I go from this

dev            C - D
             /
master A - B

to this?

dev                D
                 /
master A - B - C

I know I'm going to kick myself when I see the answer, but for the moment I'm a bit stuck...

score 115 · Accepted Answer · edited Jan 07 '16 at 21:39

115

git checkout master
git merge C

With C being the SHA1 of commit C.

                 D (dev)
                /
master A - B - C (move master HEAD)

It should be a fast-forward merge.

edited Jan 07 '16 at 21:39

Don Scott

answered Aug 16 '10 at 11:08

VonC

aragaer · Answer 2 · 2016-10-29T10:16:05.007

19

Necromancy, I know.

git branch -f master C

Will not touch current working tree at all - you can have your work in progress.

edited Oct 29 '16 at 10:16

answered Apr 24 '14 at 11:09

aragaer

Does it need to be done when being on a specific branch or not? – jeromej Sep 17 '18 at 11:41
You can be on any branch, except, maybe, master. – aragaer Sep 17 '18 at 11:42

2 Answers2