Skip to content

Instantly share code, notes, and snippets.

Avatar

Mattia Cattarinussi mcattarinussi

  • Italy
View GitHub Profile
@n00neimp0rtant
n00neimp0rtant / gist:9515611
Last active Mar 15, 2022
simple squash without rebase
View gist:9515611
## within current branch, squashes all commits that are ahead of master down into one
## useful if you merged with upstream in the middle of your commits (rebase could get very ugly if this is the case)
## commit any working changes on branch "mybranchname", then...
git checkout master
git checkout -b mybranchname_temp
git merge --squash mybranchname
git commit -am "Message describing all squashed commits"
git branch -m mybranchname mybranchname_unsquashed
git branch -m mybranchname