One of the most powerful tools to master is rewriting git history. No wonder the post Git Interactive Rebase, Squash, Amend and Other Ways of Rewriting History, written by former thoughtbot teammate Tute Costa, is so popular!
It has been updated and the changes include:
- replacing mentions of
master
with the more commonmain
- adding notes about GitHub Sync Fork, which was introduced after the post
was published, and the
git commit --amend --no-edit
flag - adding a link to our git guides page
To revisit the updated post and brush off your git tools, check out Git Interactive Rebase, Squash, Amend and Other Ways of Rewriting History.