git diff

git config diff.tool 查看diff.tool的配置
git config diff.tool vimdiff 设置vimdiff
git config --global difftool.prompt No

 

git difftool 813c17a ./projects/stream_serv/ServerLogical_client.cpp

 

 

git diff --ignore-space-at-eol，或git diff --ignore-space-change，或git diff --ignore-all-space。

https://liam.page/2019/08/06/ignnore-white-space-differences-when-using-vimdiff/

 

“.vimrc”
if &diff
    set diffopt+=iwhite
endif

vimdiff -c 'set diffopt+=iwhite'

　　

 git diff commit_id  commit_id^  file