Public Service Announcement: 'git rebase --whitespace=fix' is your friend! Fixes trailing whitespace on *only* the lines you changed.