Skip to content

Instantly share code, notes, and snippets.

@olegchursin

olegchursin/commit-squashing.md

Created March 2, 2020 15:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save olegchursin/fd0d6b3d3893be3b58c48036d5be118f to your computer and use it in GitHub Desktop.
Save olegchursin/fd0d6b3d3893be3b58c48036d5be118f to your computer and use it in GitHub Desktop.
Download ZIP
Commit squashing flow
Raw
commit-squashing.md
  • Make sure your branch is up to date with the master branch.
  • Run git rebase -i master.
  • You should see a list of commits, each commit starting with the word "pick".
  • Make sure the first commit says "pick" and change the rest from "pick" to "squash". -- This will squash each commit into the previous commit, which will continue until every commit is squashed into the first commit.
  • Save and close the editor (press Esc key, type :w and hit Enter key) -- save a file and quit vim / Vi by pressing Esc key, type :x and hit Enter key.
  • It will give you the opportunity to change the commit message.
  • Save and close the editor again.
  • Then you have to force push the final, squashed commit: git push --force-with-lease origin.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment