git diff：对比working tree、stage、commit文件之间的不同

摘要：在使用git的时候，我们经常需要查看当前工作目录、stage、和commit三种文件状态之间的差异，从而决定如何操作。为了达到这一目的，我们需要熟练使用git diff命令.

本文来源：git diff：对比working tree、stage、commit文件之间的不同

http://blog.csdn.net/trochiluses/article/details/14453701

1.说明

git-diff - Show changes between commits, commit and working tree, etc

2.语法

       git diff [options] [<commit>] [--] [<path>...]

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

3.常用形式与说明

 git diff [--options] [--] [<path>...]：对比working tree和stage状态下文件的不同

 git diff [--options] --cached [<commit>] [--] [<path>...]：对比stage和commit状态下文件的差异

git diff [--options] <commit> [--] [<path>...]：对比working tree和stage文件的差异

4.实例

               $ git diff            (1)：working tree和stage文件的差异
               $ git diff --cached   (2)stage和commit文件的差异
               $ git diff HEAD       (3)：commit和working tree文件的差异

               $ git diff test            (1)：不是对比当前分支，而是对比test分支
               $ git diff HEAD -- ./test  (2)：对比其中的test文件
               $ git diff HEAD^ HEAD      (3)：对比最近两次提交之间的差异

                $ git diff topic master    (1)：对比topic和master分支的差异