git remove merge commit from history

by

Do git rebase -i <sha before the branches diverged> this will allow you to remove the merge commit and the log will be one single line as you wanted. You can also delete any commits that you do not want any more. The reason that your rebase wasn’t working was that you weren’t going back far enough.

WARNING:
You are rewriting history doing this. Doing this with changes that have been pushed to a remote repo will cause issues. I recommend only doing this with commits that are local.

More Related Contents:

  1. When do you use Git rebase instead of Git merge?
  2. Git workflow and rebase vs merge questions
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. I ran into a merge conflict. How can I abort the merge?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. What is the difference between merge –squash and rebase?
  9. Is there a git-merge –dry-run option?
  10. How to squash all git commits into one?
  11. Insert a commit before the root commit in Git?
  12. How to git rebase a branch with the onto command?
  13. How to inject a commit between some two arbitrary commits in the past?
  14. How do I safely merge a Git branch into master?
  15. Rebasing a Git merge commit
  16. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  17. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  18. Merge development branch with master
  19. how can I customize git’s merge commit message?
  20. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  21. How do I squash two non-consecutive commits?
  22. How do I select a merge strategy for a git rebase?
  23. How do I git rebase the first commit?
  24. Git interactive rebase without opening the editor
  25. How to merge specific files from Git branches
  26. Git: How to rebase to a specific commit?
  27. git rebase merge conflict
  28. Git rebase branch with all parent branches (or dependent sub-branches)
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. How do you detect an evil merge in git?

Leave a Comment