Skip to content

Instantly share code, notes, and snippets.

@kaankaraoglu

kaankaraoglu/git-squash.md

Last active August 19, 2019 13:30
Show Gist options
  • Save kaankaraoglu/a9d839e82b09c6ef1aaf5fad46265d54 to your computer and use it in GitHub Desktop.
Save kaankaraoglu/a9d839e82b09c6ef1aaf5fad46265d54 to your computer and use it in GitHub Desktop.
Download ZIP
git-squash
Raw
git-squash.md

git-squash

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. 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 -f.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment