Rebases should not assume master.
I've been using fugitive for diffs in vim and the removed approach really sucks if there are lots of modified files.