整体比较
git diff <localbranch> <remote/branch>
比如我的本地分支名为dev,远程分支名为dev。
那要比较本地和远程的区别就应该写成
git diff dev origin/dev
比较单独的文件
git diff <local/filepath> <remote/filepath>
git diff src/a.txt src/a.txt
git diff <localbranch> <remote/branch>
比如我的本地分支名为dev,远程分支名为dev。
那要比较本地和远程的区别就应该写成
git diff dev origin/dev
git diff <local/filepath> <remote/filepath>
git diff src/a.txt src/a.txt
转载于:https://my.oschina.net/yeahlife/blog/1927414