Rebasing a Git merge commit

by

There are two options here.

One is to do an interactive rebase and edit the merge commit, redo the merge manually and continue the rebase.

Another is to use the --rebase-merges option on git rebase, which is described as follows from the manual:

By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With –rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually.“

More Related Contents:

  1. What is the difference between merge –squash and rebase?
  2. How to squash all git commits into one?
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. Combine the first two commits of a Git repository?
  5. Undoing a git rebase
  6. Edit the root commit in Git?
  7. Insert a commit before the root commit in Git?
  8. How to remove/delete a large file from commit history in the Git repository?
  9. Remove folder and its contents from git/GitHub’s history
  10. Rebasing a branch including all its children
  11. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  12. git cherry-pick says “…38c74d is a merge but no -m option was given”
  13. How to rebase many branches (with the same base commit) at once?
  14. Squash the first two commits in Git? [duplicate]
  15. Can I make fast forwarding be off by default in git?
  16. git rebase and git push: non-fast forward, why use?
  17. How do I use `git rebase -i` after `git merge` without messing things up?
  18. How to identify conflicting commits by hash during git rebase?
  19. Change old commit message using `git rebase`
  20. How to merge two branches without a common ancestor?
  21. How to rebase one Git repository onto another one?
  22. Git interactive rebase without opening the editor
  23. Git: How to rebase to a specific commit?
  24. Git rebase branch with all parent branches (or dependent sub-branches)
  25. How to merge a specific commit in Git
  26. How to cherry-pick multiple commits
  27. Git cherry pick and datamodel integrity
  28. Git: merging public and private branches while while keeping certain files intact in both branches
  29. Are there any downsides to enabling git rerere?
  30. Rebasing and what does one mean by rebasing pushed commits

Leave a Comment