Skip to content

Instantly share code, notes, and snippets.

@jdaily

jdaily/squash

Created March 10, 2016 18:34
Show Gist options
  • Save jdaily/c59dc92c3256f5f0871f to your computer and use it in GitHub Desktop.
Save jdaily/c59dc92c3256f5f0871f to your computer and use it in GitHub Desktop.
Download ZIP
Squash a Feature Branch against Master
Raw
squash
git branch [Feature]-squashed
git checkout [Feature]-squashed
git reset --hard upstream/master
git merge --squash upstream/[Feature]
git commit -m "squashed [Feature] PR to one commit"
git push origin [Feature]-squashed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment