Tidying up Git Log with Rebase