Changing the starting commit of a new git branch

Question

I forgot to do a pull before creating a new branch. I did not recognize that, did the work and a finishing merge. Now I see that the starting point of the new (and now merged) branch is wrong as it is too far in the past.

Is it possible to correct that?

Create a new branch from the right point, then cherry-pick your commits. — skypjack, Aug 14 '16 at 06:58

score 0 · Accepted Answer · edited May 23 '17 at 12:01

0

Assume the history consists of two branches - master & topic. topic is the branch you created from master without doing a git pull.

git reset --merge ORIG_HEAD  // Undo git-merge
git checkout master
git pull
git rebase master topic  // Replay commits of topic on new master

After this you can proceed with merge (if required).

For more detail on undo git-merge, refer here

edited May 23 '17 at 12:01

Community

1
1

answered Aug 14 '16 at 09:17

Rishit Sanmukhani

2,099
13
25

Changing the starting commit of a new git branch

1 Answers1