wholeheartedly agree, git rebase -i is a game-changer once you get comfortable with it