Git: Keeping history clean using rebase