git diff

1、作用

可以显示代码差异，制作差分包；

2、格式

git diff [options] [<commit>] [--] [<path>...]
git diff [options] --cached [<commit>] [--] [<path>...]
git diff [options] <commit> <commit> [--] [<path>...]
git diff [options] <blob> <blob>
git diff [options] [--no-index] [--] <path> <path>

3、解释

git diff，显示工作空间与暂存区的差异，即还没有执行git add命令的文件或修改；

git diff --cached，显示暂存区与HEAD直接差异，即执行了git add，但是还没有执行git commit之前的待提交修改；

git diff <commit>，显示commit这次提交与HEAD之间差异；

git diff <commit1> <commit2>，显示两个commit之间的差异；

git diff <commit1>..<commit2>，同上，显示2个commit之间的差异；

git diff <commit1>...<commit2>，3个.表示显示$(git-merge-base commit1 commit2）与commit2之间差异，即同merge处开始比较，这是与上面2个.的差异；

– <path>&