Code

rebase -i: several cleanups