Skip to content

Instantly share code, notes, and snippets.

@nvdarekar
Forked from jbub/squash-commits.sh
Created October 23, 2016 14:15
Show Gist options
  • Select an option

  • Save nvdarekar/9d00393a433ae95c68dbd37f0daa5762 to your computer and use it in GitHub Desktop.

Select an option

Save nvdarekar/9d00393a433ae95c68dbd37f0daa5762 to your computer and use it in GitHub Desktop.
git squash last two commits into one
git rebase --interactive HEAD~2
# we are going to squash c into b
pick b76d157 b
pick a931ac7 c
# squash c into b
pick b76d157 b
s a931ac7 c
# after that just edit the commit message
# This is a combination of 2 commits.
# The first commit's message is:
b
# This is the 2nd commit message:
c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment