git config --global rebase.autoSquash true git commit --squash|--fixup <commit> git rebase -i origin/master # or whatever your remote/branch is https://git

git config --global rebase.autoSquash true git commit --squash|--fixup <commit> git rebase -i origin/master # or whatever your remote/branch is https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---fixupamendrewordltcommitgt https://git-scm.com/docs/git-commit#Documentation/git-commit... Works wonders, but occasionally you screw up. To get out of screwup, use `git reflog` and `git reset --hard`.