Remove diff-highlight
Add git alias rebase -i