Skip to content

Instantly share code, notes, and snippets.

@tuxfight3r
Created July 7, 2015 14:20
Show Gist options
  • Save tuxfight3r/1803dfec0e4a5e488dd3 to your computer and use it in GitHub Desktop.
Save tuxfight3r/1803dfec0e4a5e488dd3 to your computer and use it in GitHub Desktop.
git squash multiple commits with rebase
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
@zba02
Copy link

zba02 commented Jun 5, 2017

git status

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