Skip to content

Instantly share code, notes, and snippets.

@landsman
Forked from jbub/squash-commits.sh
Created July 26, 2017 13:56
Show Gist options
  • Star 2 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save landsman/d9d2b5fd03b0a3fff0c26603f3360987 to your computer and use it in GitHub Desktop.
Save landsman/d9d2b5fd03b0a3fff0c26603f3360987 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
@jerrylau91
Copy link

git rebase --interactive HEAD~2

@kenshinji
Copy link

I'm curious what's the difference between the way you posted above with following?

git reset --soft HEAD~2
git commit -m "New message for the combined commit"
git push origin +name-of-branch

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