Take out some aggression with 'git smash'.