Rebasing

What, we're not done?

A more powerful way of rebasing

We know that when we rebase we are "replaying" commits

What if we could decide step-by-step what to do with each commit?

Rebasing interactively

git rebase --interactive

git will then open a heavily commentated file that will specify how the rebase will be done

We are not going to see what every command does, just a few

What can we do with this file?

Citing the last three lines in the file:

These lines can be reordered; they are executed from top to bottom.
If you remove a line here THAT COMMIT WILL BE LOST.
However, if you remove everything the rebase will be aborted.
    

Interactive rebase: pick and drop

• pick: use the commit
• drop: remove the commit

Interactive rebase: fixup and squash

• fixup: merge into previous commit discarding the message
• squash: like fixup, but git will ask us to sort out the messages

Best use for fixup

Rember the question we left suspended a while ago?

fiuxp commits to the rescue

Fixup commits

commit has the very helpful --fixup <sha> option:

It will create a commit with a standard commit message. During a rebase, we can tell git to auto-merge it for us!

Autosquash

To tell git to auto-merge fixup commits we need to pass --autosquash to rebase

Isn't this just like a "i forgor 💀" commit?

Yes, it is.

Just don't push them