git: Using Advanced Rebase Features for a Clean Repository