Skip to content

Instantly share code, notes, and snippets.

@WagnerMoreira

WagnerMoreira/git_squash.md

Last active August 29, 2015 14:16
Show Gist options
  • Save WagnerMoreira/8c6e6897c276bece2a53 to your computer and use it in GitHub Desktop.
Save WagnerMoreira/8c6e6897c276bece2a53 to your computer and use it in GitHub Desktop.
Download ZIP
Squirtle Squirtle
Raw
git_squash.md

alt text

  1. git merge-base your_current_branch master

  2. now copy the generated hash 70277395bada59ad24b789d219a1ded550218746

  3. g.it rebase --interactive ${HASH}

  4. open vi and change pick at lines to s (except first line)

  5. 2,3s/pick/s/g 5.1 (2,3) from second to third line, changes pick to s

  6. :wq (write and quit vi) Obs: If you have conflicts at merge, solve it bitch

  7. Then vi opens again and you need to delete other commit messages except the first

  8. git config --global push.default simple

  9. git push -f origin your_current_branch

  10. GG!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment