How to edit a commit with interactive rebase

gistfile1.md

While on a branch with a couple of commits, you can edit a commit with interactive rebase. This should be used sparingly and only on branches and never on master.

1. Checkout the branch

$ git checkout my-branch

2. Get the ref of the commit that you want to edit from the commit log. (e.g. 67b191fc62eda52b5b208cc4de50df7144a03171)

$ git log

3. Begin rebasing. (Note: The carot at the end of your commit ref is important to start from the commit before your commit.)

$ git rebase --interactive 67b191fc62eda52b5b208cc4de50df7144a03171^

4. Change "pick" to "edit" for your commit and save.

5. Do not be alarmed. Your commit will be applied first and then the command will pause to allow you to make amendments. Make your changes then commit them.

$ git commit --all --amend

6. The command will remain paused for additional amendments. When all is good, continue to reaplly the rest of your commits.

$ git rebase --continue

7. Not that your branch is in a good state. Push to origin.

$ git push --force

What exactly happen when you say: "Your commit will be applied first". Is a new commit created ? Or are the changes applied to the working tree only? Or to the index?

@droopycom, I had the same question so I dug into it and wrote up some more details about the process here.