• git diff

    git diff

    git diff命令用于查看文件之间的差异。

    1. # 查看工作区与暂存区的差异
    2. $ git diff
    4. # 查看某个文件的工作区与暂存区的差异
    5. $ git diff file.txt
    7. # 查看暂存区与当前 commit 的差异
    8. $ git diff --cached
    10. # 查看两个commit的差异
    11. $ git diff <commitBefore> <commitAfter>
    13. # 查看暂存区与仓库区的差异
    14. $ git diff --cached
    16. # 查看工作区与上一次commit之间的差异
    17. # 即如果执行 git commit -a，将提交的文件
    18. $ git diff HEAD
    20. # 查看工作区与某个 commit 的差异
    21. $ git diff <commit>
    23. # 显示两次提交之间的差异
    24. $ git diff [first-branch]...[second-branch]
    26. # 查看工作区与当前分支上一次提交的差异，但是局限于test文件
    27. $ git diff HEAD -- ./test
    29. # 查看当前分支上一次提交与上上一次提交之间的差异
    30. $ git diff HEAD -- ./test
    32. # 生成patch
    33. $ git format-patch master --stdout > mypatch.patch

    比较两个分支

    1. # 查看topic分支与master分支最新提交之间的差异
    2. $ git diff topic master
    4. # 与上一条命令相同
    5. $ git diff topic..master
    7. # 查看自从topic分支建立以后，master分支发生的变化
    8. $ git diff topic...master