HomeToolsAbout a20k

Rebasing

Always branch off before doing large rebase

This allows you to hard reset to a branch when a rebase goes wrong

Incrementally squash/rebase instead of doing it all at once

Isolate the commits that are troublesome while rebasing

Abort rebasing

Manually trigger Vim error to abandon rebasing from completing

:cq

Cleaning up commit

Always prefer squash over deletion of commit

  • IF you accidentally chose HEAD position that includes commit you don't want to squash
    • Simply remove the commit from the list
© VincentVanKoh