---
title: Git Interactive Rebase, Squash, Amend and Other Ways of Rewriting History has
  been Updated
teaser: 'Read it again today to learn the git tools that will allow you to keep a
  clean git history, how to use them, and why they should be handled with care.

  '
tags: news
author: Stefanni Brasil
published_on: 2023-07-21
---

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 common `main`
- 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].

[Git Interactive Rebase, Squash, Amend and Other Ways of Rewriting History]: https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history
[Tute Costa]: https://thoughtbot.com/blog/authors/tute-costa