20210909090509-rewriting_history.org

Rewriting history

See also:

• http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
• https://stackoverflow.com/a/6217314

Splitting commits

The last commit

Just reset and commit the individual pieces.

git reset HEAD~

So, what is the difference between the caret and tilda?

Commits older than the last one

1. Use interactive rebase against the commit you want to split.

   git rebase -i COMMITSHA1~
       

2. Choose to edit the commit on the interactive screen.
3. Reset…

   git reset HEAD~
       

4. Commit the individual pieces.
5. Continue the rebase (eg, git rebase --continue)