vimdiff ignores whitespace
Added more git aliases