How do I squash two non-consecutive commits?

by

You can run git rebase --interactive and reorder D before B and squash D into A.

Git will open an editor, and you see a file like this, ex: git rebase --interactive HEAD~4

pick aaaaaaa Commit A
pick bbbbbbb Commit B
pick ccccccc Commit C
pick ddddddd Commit D

# Rebase aaaaaaa..ddddddd onto 1234567 (4 command(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

Now you change the file that it looks like this:

pick aaaaaaa Commit A
squash ddddddd Commit D
pick bbbbbbb Commit B
pick ccccccc Commit C

And git will now meld the changes of A and D together into one commit, and put B and C afterwards. When you don’t want to keep the commit message of D, instead of squash, you would use the fixup keyword. For more on fixup, you can consult the git rebase docs, or check out this question which has some good answers.

More Related Contents:

  1. Undoing a git rebase
  2. What is the difference between merge –squash and rebase?
  3. How to squash all git commits into one?
  4. Insert a commit before the root commit in Git?
  5. What’s the difference between ‘git merge’ and ‘git rebase’?
  6. Combine the first two commits of a Git repository?
  7. Remove folder and its contents from git/GitHub’s history
  8. Rebasing a branch including all its children
  9. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  10. How to git rebase a branch with the onto command?
  11. How to inject a commit between some two arbitrary commits in the past?
  12. Rebasing a Git merge commit
  13. How do I delete a commit from a branch?
  14. Squash the first two commits in Git? [duplicate]
  15. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  16. How to identify conflicting commits by hash during git rebase?
  17. Change old commit message using `git rebase`
  18. What is the difference between git pull and git fetch + git rebase?
  19. How do I select a merge strategy for a git rebase?
  20. Rebase feature branch onto another feature branch
  21. Your branch is ahead of ‘origin/master’ by 3 commits
  22. How do I git rebase the first commit?
  23. Git interactive rebase without opening the editor
  24. git rebase: “error: cannot stat ‘file’: Permission denied”
  25. Git: How to rebase to a specific commit?
  26. git rebase merge conflict
  27. Git rebase branch with all parent branches (or dependent sub-branches)
  28. How to retain commit gpg-signature after interactive rebase squashing?
  29. Git rebase –preserve-merges fails
  30. Can tags be automatically moved after a git filter-branch and rebase?

Leave a Comment