Keeping history clean using rebase