{"id":20328,"date":"2024-11-19T08:26:04","date_gmt":"2024-11-19T00:26:04","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20328\/"},"modified":"2024-11-19T08:26:04","modified_gmt":"2024-11-19T00:26:04","slug":"git-diff%e6%ad%a3%e7%a1%ae%e7%94%a8%e6%b3%95","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20328\/","title":{"rendered":"git diff\u6b63\u786e\u7528\u6cd5"},"content":{"rendered":"

\u4f5c\u4e3a\u4e00\u4f4d\u7a0b\u5e8f\u5458\uff0cgit\u5bf9\u6211\u4eec\u6765\u8bf4\u51e0\u4e4e\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\u4e00\u6b3e\u5de5\u5177\u3002git\u4f5c\u4e3a\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5e2e\u52a9\u6211\u4eec\u7ba1\u7406\u6587\u4ef6\u7684\u4fee\u6539\u548c\u7248\u672c\u7684\u8ffd\u6eaf\uff0c\u7279\u522b\u662f\u5728\u5f00\u53d1\u5927\u578b\u8f6f\u4ef6\u9879\u76ee\u65f6\uff0cgit\u53ef\u4ee5\u5e2e\u52a9\u7ba1\u7406\u56e2\u961f\u6210\u5458\u4e4b\u95f4\u7684\u4ee3\u7801\u5408\u5e76\uff0c\u907f\u514d\u4e86\u51b2\u7a81\u548c\u4ee3\u7801\u4e22\u5931\u7b49\u95ee\u9898\u3002<\/p>\n

\u800c\u5728Git\u4e2d\uff0cdiff\u547d\u4ee4\u5219\u662f\u5e2e\u52a9\u6211\u4eec\u6bd4\u8f83\u6587\u4ef6\u548c\u7248\u672c\u4e4b\u95f4\u5dee\u5f02\u7684\u91cd\u8981\u5de5\u5177\u4e4b\u4e00\uff0c\u7ecf\u5e38\u88ab\u7a0b\u5e8f\u5458\u4eec\u6240\u4f7f\u7528\u3002\u7136\u800c\uff0c\u867d\u7136diff\u547d\u4ee4\u770b\u4f3c\u7b80\u5355\uff0c\u4f46\u5177\u4f53\u7684\u7528\u6cd5\u8fd8\u662f\u6709\u5f88\u591a\u7ec6\u8282\u9700\u8981\u6ce8\u610f\uff0c\u672c\u6587\u5c06\u4f1a\u8be6\u7ec6\u4ecb\u7ecdgit diff\u547d\u4ee4\u7684\u6b63\u786e\u7528\u6cd5\u3002<\/p>\n

    \n
  1. \u57fa\u672c\u8bed\u6cd5<\/li>\n<\/ol>\n

    Git diff\u7684\u57fa\u672c\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n

    git diff [<options>] [<commit>] [--] [<path> ...]<\/path><\/commit><\/options><\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5176\u4e2d\uff0coptions\u4e3a\u53ef\u9009\u9879\uff0ccommit\u4e3a\u6bd4\u8f83\u7684\u4e24\u4e2a\u7248\u672c\u4e4b\u4e00\uff0c\u9ed8\u8ba4\u4e3aHEAD\uff0cpath\u4e3a\u6307\u5b9a\u7684\u8def\u5f84\uff0c\u53ef\u9009\u3002<\/p>\n
    \u6ce8\u610f\uff1a\u2018–\u2019 \u662f\u5206\u9694\u7b26\uff0c\u540e\u9762\u7684\u8def\u5f84\u8868\u793a\u7684\u662f\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u3002<\/p>\n
    \u4f8b\u5982\uff0c\u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/p>\n
    git diff<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u7248\u672c\u4e4b\u95f4\u7684\u67d0\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\uff1a<\/p>\n
    git diff file1.txt<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u6bd4\u8f83\u6307\u5b9a\u7684\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/p>\n
    git diff abc123 def456<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \n
    1. \u53c2\u6570\u8be6\u89e3<\/li>\n<\/ol>\n
      git diff\u547d\u4ee4\u7684\u53ef\u9009\u53c2\u6570\u6709\u5f88\u591a\uff0c\u4ee5\u4e0b\u662f\u5176\u4e2d\u6bd4\u8f83\u91cd\u8981\u7684\u51e0\u4e2a\uff1a<\/p>\n
        \n
      • –cached: \u6bd4\u8f83\u6682\u5b58\u533a\u4e0e\u5f53\u524d\u5206\u652f\u6700\u65b0\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
        git diff --cached<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \n
        • –staged: \u540c–cached\u9009\u9879\u3002\u662f\u4e0a\u8ff0\u9009\u9879\u7684\u53e6\u4e00\u79cd\u7528\u6cd5\u3002<\/li>\n<\/ul>\n
          git diff --staged<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \n
          • –shortstat: \u8f93\u51fa\u7b80\u77ed\u7684\u7edf\u8ba1\u4fe1\u606f\uff0c\u5305\u62ec\u4fee\u6539\u8fc7\u7684\u6587\u4ef6\u6570\u3001\u63d2\u5165\u7684\u884c\u6570\u548c\u5220\u9664\u7684\u884c\u6570\u7b49\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
            git diff --shortstat<\/pre>\n
              \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \u8f93\u51fa\uff1a<\/p>\n
            2 files changed, 10 insertions(+), 5 deletions(-)<\/pre>\n
              \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
              \n
            • -w\u6216–ignore-all-space: \u5ffd\u7565\u7a7a\u683c\u548ctab\u952e\u7684\u5dee\u5f02\u3002\u5982\u679c\u53ea\u662f\u5355\u72ec\u4f7f\u7528-w\u9009\u9879\uff0c\u5219\u4f1a\u6bd4\u8f83\u5f53\u524d\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u5206\u652f\u6240\u5b58\u50a8\u7684\u6587\u4ef6\u7684\u5dee\u5f02\uff1b\u5982\u679c\u642d\u914d\u5176\u4ed6\u53c2\u6570\u4f7f\u7528\uff0c\u5219\u4f1a\u6bd4\u8f83\u6307\u5b9a\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
              # \u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u7248\u672c\u7684\u5dee\u5f02\uff0c\u5ffd\u7565\u7a7a\u683c\u548ctab\u952e\u7684\u53d8\u5316\ngit diff -w\n\n# \u6bd4\u8f83\u67d0\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u5ffd\u7565\u7a7a\u683c\u548ctab\u952e\u7684\u53d8\u5316\ngit diff -w abc123 def456<\/pre>\n
                \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                \n
              • –name-only: \u53ea\u663e\u793a\u6709\u53d8\u5316\u7684\u6587\u4ef6\u7684\u6587\u4ef6\u540d\uff0c\u800c\u4e0d\u663e\u793a\u5177\u4f53\u7684\u5dee\u5f02\u5185\u5bb9\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
                git diff --name-only<\/pre>\n
                  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                \u8f93\u51fa\uff1a<\/p>\n
                file1.txt\nfile2.txt<\/pre>\n
                  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                  \n
                • –name-status: \u663e\u793a\u6709\u53d8\u5316\u7684\u6587\u4ef6\u7684\u6587\u4ef6\u540d\u548c\u53d8\u5316\u7c7b\u578b\uff08\u5373\u4fee\u6539\u3001\u6dfb\u52a0\u3001\u5220\u9664\u7b49\uff09\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
                  git diff --name-status<\/pre>\n
                    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                  \u8f93\u51fa\uff1a<\/p>\n
                  M file1.txt\nA file3.txt\nD file4.txt<\/pre>\n
                    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                    \n
                  • -U\/–unified=: \u663e\u793a\u5dee\u5f02\u4e0a\u4e0b\u6587\u7684\u884c\u6570\u3002\u5982\u679c\u6ca1\u6709\u6307\u5b9a\uff0c\u5219\u9ed8\u8ba4\u4e3a3\u3002\u4f8b\u5982\uff1a<\/li>\n<\/ul>\n
                    # \u663e\u793a\u6709\u53d8\u5316\u7684\u6587\u4ef6\u76845\u884c\u5dee\u5f02\u4e0a\u4e0b\u6587\u5185\u5bb9\ngit diff -U5\n\n# \u6bd4\u8f83\u67d0\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u663e\u793a10\u884c\u5dee\u5f02\u4e0a\u4e0b\u6587\ngit diff -U10 abc123 def456<\/pre>\n
                      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                      \n
                    1. \u5176\u4ed6\u7528\u6cd5<\/li>\n<\/ol>\n
                      Git diff\u9664\u4e86\u4ee5\u4e0a\u4ecb\u7ecd\u7684\u7528\u6cd5\u4e4b\u5916\uff0c\u8fd8\u6709\u5176\u4ed6\u7684\u4e00\u4e9b\u7528\u6cd5\uff0c\u5982\uff1a<\/p>\n
                        \n
                      • \u6bd4\u8f83\u4e24\u4e2a\u5206\u652f\u7684\u5dee\u5f02\uff1a<\/li>\n<\/ul>\n
                        git diff branch1..branch2<\/pre>\n
                          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                          \n
                        • \u6bd4\u8f83\u4e24\u4e2a\u6807\u7b7e\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/li>\n<\/ul>\n
                          git diff tag1..tag2<\/pre>\n
                            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                            \n
                          • \u6bd4\u8f83\u67d0\u4e2a\u63d0\u4ea4\u4e0e\u5f53\u524d\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/li>\n<\/ul>\n
                            git diff commit-id<\/pre>\n
                              \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                              \n
                            • \u6309\u7167\u535a\u5ba2\u683c\u5f0f\u8f93\u51fa\uff1a<\/li>\n<\/ul>\n
                              git diff --no-prefix &gt; myfile.patch<\/pre>\n
                                \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                              \u4f7f\u7528\u4ee5\u4e0a\u547d\u4ee4\u53ef\u4ee5\u5c06diff\u7684\u8f93\u51fa\u6309\u7167\u535a\u5ba2\u5e38\u89c1\u7684\u683c\u5f0f\u8f93\u51fa\u3002<\/p>\n
                                \n
                              • \u6bd4\u8f83\u4e0d\u540c\u5206\u652f\u6216\u4e0d\u540c\u4ed3\u5e93\uff1a<\/li>\n<\/ul>\n
                                git diff origin\/master..HEAD<\/pre>\n
                                  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                                \u5176\u4e2d\uff0corigin\/master \u4e3a\u8fdc\u7a0b\u5206\u652f\u3002\u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u540c\u65f6\u6bd4\u8f83\u8fdc\u7a0b\u5206\u652f\u548c\u672c\u5730\u5206\u652f\uff0c\u6216\u8005\u6bd4\u8f83\u672c\u5730\u4e24\u4e2a\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n
                                  \n
                                1. \u603b\u7ed3<\/li>\n<\/ol>\n
                                  Git diff \u547d\u4ee4\u662fGit\u7248\u672c\u63a7\u5236\u4e2d\u975e\u5e38\u91cd\u8981\u7684\u5de5\u5177\u4e4b\u4e00\uff0c\u672c\u6587\u4ecb\u7ecd\u4e86git diff\u7684\u57fa\u672c\u8bed\u6cd5\u548c\u53c2\u6570\u8be6\u89e3\uff0c\u5e76\u7ed9\u51fa\u4e86\u4e00\u4e9b\u7279\u6b8a\u7684\u7528\u6cd5\u3002<\/p>\n
                                  \u4f7f\u7528Git diff \u7684\u65f6\u5019\u8981\u6ce8\u610f\u5b9e\u9645\u9700\u6c42\uff0c\u9009\u62e9\u5408\u9002\u7684\u53c2\u6570\uff0c\u907f\u514d\u9020\u6210\u4e0d\u5fc5\u8981\u7684\u5f71\u54cd\u3002\u540c\u65f6\uff0c\u5728\u6bd4\u8f83\u4e0d\u540c\u5206\u652f\u6216\u4e0d\u540c\u4ed3\u5e93\u65f6\u4e5f\u8981\u683c\u5916\u5c0f\u5fc3\u3002<\/p>\n
                                  \u6700\u540e\uff0c\u5f00\u53d1\u8fc7\u7a0b\u4e2dGit diff \u7684\u6b63\u786e\u4f7f\u7528\u53ef\u4ee5\u5e2e\u52a9\u5f00\u53d1\u8005\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\uff0c\u66f4\u597d\u5730\u7ec4\u7ec7\u5f00\u53d1\u6d41\u7a0b\uff0c\u63d0\u9ad8\u9879\u76ee\u7684\u5f00\u53d1\u6548\u7387\u3002<\/p>\n
                                  \u4ee5\u4e0a\u5c31\u662fgit diff\u6b63\u786e\u7528\u6cd5\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
                                  \u4f5c\u4e3a\u4e00\u4f4d\u7a0b\u5e8f\u5458\uff0cgit\u5bf9\u6211\u4eec\u6765\u8bf4\u51e0\u4e4e\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\u4e00\u6b3e\u5de5\u5177\u3002git\u4f5c\u4e3a\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5e2e\u52a9\u6211\u4eec\u7ba1\u7406\u6587\u4ef6\u7684\u4fee\u6539\u548c\u7248\u672c\u7684\u8ffd\u6eaf\uff0c\u7279\u522b\u662f\u5728\u5f00\u53d1\u5927\u578b\u8f6f\u4ef6\u9879\u76ee\u65f6\uff0cgit\u53ef\u4ee5\u5e2e\u52a9\u7ba1\u7406\u56e2\u961f\u6210\u5458\u4e4b\u95f4\u7684\u4ee3\u7801\u5408\u5e76\uff0c\u907f\u514d\u4e86\u51b2\u7a81\u548c\u4ee3\u7801\u4e22\u5931\u7b49\u95ee\u9898\u3002 \u800c\u5728Git\u4e2d\uff0cdiff\u547d\u4ee4\u5219\u662f\u5e2e\u52a9\u6211\u4eec\u6bd4\u8f83\u6587\u4ef6\u548c\u7248\u672c\u4e4b\u95f4\u5dee\u5f02\u7684\u91cd\u8981\u5de5\u5177\u4e4b\u4e00\uff0c\u7ecf\u5e38\u88ab\u7a0b\u5e8f\u5458\u4eec\u6240\u4f7f\u7528\u3002\u7136\u800c\uff0c\u867d\u7136diff\u547d\u4ee4\u770b\u4f3c\u7b80\u5355\uff0c\u4f46\u5177\u4f53\u7684\u7528\u6cd5\u8fd8\u662f\u6709\u5f88\u591a\u7ec6\u8282\u9700\u8981\u6ce8\u610f\uff0c\u672c\u6587\u5c06\u4f1a\u8be6\u7ec6\u4ecb\u7ecdgit diff\u547d\u4ee4\u7684\u6b63\u786e\u7528\u6cd5\u3002 \u57fa\u672c\u8bed\u6cd5 Git diff\u7684\u57fa\u672c\u8bed\u6cd5\u5982\u4e0b\uff1a git diff [<options>] [<commit>] [–] [<path> …]<\/path><\/commit><\/options> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0coptions\u4e3a\u53ef\u9009\u9879\uff0ccommit\u4e3a\u6bd4\u8f83\u7684\u4e24\u4e2a\u7248\u672c\u4e4b\u4e00\uff0c\u9ed8\u8ba4\u4e3aHEAD\uff0cpath\u4e3a\u6307\u5b9a\u7684\u8def\u5f84\uff0c\u53ef\u9009\u3002 \u6ce8\u610f\uff1a\u2018–\u2019 \u662f\u5206\u9694\u7b26\uff0c\u540e\u9762\u7684\u8def\u5f84\u8868\u793a\u7684\u662f\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u3002 \u4f8b\u5982\uff0c\u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a git diff \u767b\u5f55\u540e\u590d\u5236 \u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u5f53\u524d\u7248\u672c\u4e4b\u95f4\u7684\u67d0\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\uff1a git diff file1.txt \u767b\u5f55\u540e\u590d\u5236 \u6bd4\u8f83\u6307\u5b9a\u7684\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a git diff abc123 def456 \u767b\u5f55\u540e\u590d\u5236 \u53c2\u6570\u8be6\u89e3 git diff\u547d\u4ee4\u7684\u53ef\u9009\u53c2\u6570\u6709\u5f88\u591a\uff0c\u4ee5\u4e0b\u662f\u5176\u4e2d\u6bd4\u8f83\u91cd\u8981\u7684\u51e0\u4e2a\uff1a –cached: \u6bd4\u8f83\u6682\u5b58\u533a\u4e0e\u5f53\u524d\u5206\u652f\u6700\u65b0\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u4f8b\u5982\uff1a git diff –cached \u767b\u5f55\u540e\u590d\u5236 –staged: \u540c–cached\u9009\u9879\u3002\u662f\u4e0a\u8ff0\u9009\u9879\u7684\u53e6\u4e00\u79cd\u7528\u6cd5\u3002 git diff –staged \u767b\u5f55\u540e\u590d\u5236 –shortstat: \u8f93\u51fa\u7b80\u77ed\u7684\u7edf\u8ba1\u4fe1\u606f\uff0c\u5305\u62ec\u4fee\u6539\u8fc7\u7684\u6587\u4ef6\u6570\u3001\u63d2\u5165\u7684\u884c\u6570\u548c\u5220\u9664\u7684\u884c\u6570\u7b49\u3002\u4f8b\u5982\uff1a git diff –shortstat \u767b\u5f55\u540e\u590d\u5236 \u8f93\u51fa\uff1a 2 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20328","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20328","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20328"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20328\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20328"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20328"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20328"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}