Git: rebase merge commit

Question

How i should use rebase for this case:

I have 3 features in branches:

feature/f1
feature/f2
feature/f3

and I have master branch: master I merge this 3 features into master branch.

My commit history looks like:

Merge f3 into master
Merge f2 into master
Merge f1 into master

During testing, I found that my function f2 is not working correctly.

How could I rebase changes (not interactive mode), to my history looks like:

Merge f3 into master
Merge f1 into master

Thanks.

possible duplicate of Rebase a merge commit

sschuberth
– sschuberth

2014-10-29 12:55:30 +00:00
Commented Oct 29, 2014 at 12:55 — sschuberth
– sschuberth, Commented Oct 29, 2014 at 12:55

mdup · Accepted Answer · 2013-08-01 07:41:16Z

6

You could use git rebase --preserve-merges -i HEAD~4. This will open an editor with the three last commits. Remove the line where "Merge f2 into master" appears.

More information on rebase -i

answered Aug 1, 2013 at 7:41

mdup

8,6873 gold badges34 silver badges34 bronze badges

Sign up to request clarification or add additional context in comments.

6 Comments

CharlesB Over a year ago

you need to add --preserve-merges to the rebase command, or the f3 merge won't be correctly rebased

Denis B Over a year ago

Thanks for your answer. I need to rebase this merge commit in auto mode. Updated description.

Denis B Over a year ago

Is there any not-interactive mode? I need autorebase merge commit from history

CharlesB Over a year ago

@DenisB: Why don't you want interactive mode?

Denis B Over a year ago

I have wrote tool, that helps me to merge features into build branch.

|

Collectives™ on Stack Overflow

Git: rebase merge commit

1 Answer 1

6 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

6 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related