Combining multiple commits before pushing in Git [duplicate]

by

What you want to do is referred to as “squashing” in git. There are lots of options when you’re doing this (too many?) but if you just want to merge all of your unpushed commits into a single commit, do this:

git rebase -i origin/master

This will bring up your text editor (-i is for “interactive”) with a file that looks like this:

pick 16b5fcc Code in, tests not passing
pick c964dea Getting closer
pick 06cf8ee Something changed
pick 396b4a3 Tests pass
pick 9be7fdb Better comments
pick 7dba9cb All done

Change all the pick to squash (or s) except the first one:

pick 16b5fcc Code in, tests not passing
squash c964dea Getting closer
squash 06cf8ee Something changed
squash 396b4a3 Tests pass
squash 9be7fdb Better comments
squash 7dba9cb All done

Save your file and exit your editor. Then another text editor will open to let you combine the commit messages from all of the commits into one big commit message.

Voila! Googling “git squashing” will give you explanations of all the other options available.

More Related Contents:

  1. Squash my last X commits together using Git
  2. How can I merge multiple commits onto another branch as a single squashed commit?
  3. How to squash my last x commits together?
  4. How do I squash my last N commits together?
  5. How do you squash commits into one patch with git format-patch?
  6. How to fetch all Git branches
  7. How to configure Git for using it with Dropbox?
  8. Git Init in home directory – now unable to commit changes
  9. Does github remember commit IDs?
  10. Git status shows files as changed even though contents are the same
  11. Git fails when pushing commit to github
  12. git: Your branch is ahead by X commits
  13. Git with Dropbox Issues
  14. What is .gitignore?
  15. How to sort git tags by version string order of form rc-X.Y.Z.W?
  16. Git clone: Redirect stderr to stdout but keep errors being written to stderr
  17. What does ^{} mean in git?
  18. When listing git-ls-remote why there’s “^{}” after the tag name? [duplicate]
  19. How to update a git shallow clone?
  20. how can I customize git’s merge commit message?
  21. How can I view file history in Git?
  22. Which characters are illegal within a branch name?
  23. Git pushing to remote GitHub repository as wrong user
  24. Error: Cannot pull with rebase: You have unstaged changes
  25. Git rebase branch with all parent branches (or dependent sub-branches)
  26. How to clone git repository from its zip
  27. git branch permissions
  28. How can I reduce the ever-increasing time to push a subtree?
  29. Getting a list of all children of a given commit
  30. GitHub Api download zip or tarball link

Leave a Comment