Git Diff<\/h1>\n<\/p><\/div>\n

\n Git diff\u662f\u4e00\u4e2a\u547d\u4ee4\u884c\u5b9e\u7528\u7a0b\u5e8f\u3002\u8fd9\u662f\u4e00\u4e2a\u591a\u7528\u9014\u7684Git\u547d\u4ee4\u3002\u6267\u884c\u5b83\u65f6\uff0c\u5b83\u5c06\u5728Git\u6570\u636e\u6e90\u4e0a\u8fd0\u884cdiff\u51fd\u6570\u3002\u8fd9\u4e9b\u6570\u636e\u6e90\u53ef\u4ee5\u662f\u6587\u4ef6\uff0c\u5206\u652f\uff0c\u63d0\u4ea4\u7b49\u3002\u5b83\u7528\u4e8e\u663e\u793a\u63d0\u4ea4\uff0c\u63d0\u4ea4\u548c\u5de5\u4f5c\u6811\u7b49\u4e4b\u95f4\u7684\u66f4\u6539\u3002\n <\/div>\n

\n \u5b83\u6bd4\u8f83\u6570\u636e\u6e90\u7684\u4e0d\u540c\u7248\u672c\u3002\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4ee3\u8868\u4f7f\u7528\u6587\u4ef6\u7684\u4fee\u6539\u7248\u672c\u3002\u56e0\u6b64\uff0cdiff\u547d\u4ee4\u662f\u4f7f\u7528Git\u7684\u6709\u7528\u5de5\u5177\u3002\n <\/div>\n

\n \u4f46\u662f\uff0c\u6211\u4eec\u8fd8\u53ef\u4ee5\u5728\u5e26\u6709-p\u9009\u9879\u7684git log\u547d\u4ee4\u7684\u5e2e\u52a9\u4e0b\u8ddf\u8e2a\u66f4\u6539\u3002 git log\u547d\u4ee4\u4e5f\u53ef\u4ee5\u7528\u4f5cgit diff\u547d\u4ee4\u3002\n <\/div>\n

\n \u8ba9\u6211\u4eec\u4e86\u89e3\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u7684\u4e0d\u540c\u573a\u666f\u3002\n <\/div>\n

\n \u573a\u666f1: \u8ddf\u8e2a\u5c1a\u672a\u6682\u5b58\u7684\u66f4\u6539\u3002\n <\/div>\n

\n \u901a\u5e38\u4f7f\u7528git diff\u547d\u4ee4\u53ef\u4ee5\u8ddf\u8e2a\u5c1a\u672a\u6682\u5b58\u7684\u66f4\u6539\u3002\n <\/div>\n

\n \u5047\u8bbe\u6211\u4eec\u5df2\u7f16\u8f91newfile1.txt\u6587\u4ef6\u3002\u73b0\u5728\uff0c\u6211\u4eec\u8981\u8ddf\u8e2a\u5c1a\u672a\u8fdb\u884c\u7684\u66f4\u6539\u3002\u7136\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u4ecegit diff\u547d\u4ee4\u6267\u884c\u6b64\u64cd\u4f5c\u3002\u8003\u8651\u4e0b\u9762\u7684\u8f93\u51fa:\n <\/div>\n

$Git Diff_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c1\u5f20$ <\/p>\n

\n \u4ece\u4e0a\u9762\u7684\u8f93\u51fa\u4e2d\uff0c\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u5bf9git diff\u547d\u4ee4\u663e\u793anewfile1.txt\u3002\u6b63\u5982\u6211\u4eec\u5c06\u5176\u7f16\u8f91\u4e3a\"\u8fdb\u884c\u4e86\u4e00\u4e9b\u66f4\u6539\u4ee5\u4e86\u89e3git diff\u547d\u4ee4\"\u3002\u56e0\u6b64\uff0c\u8f93\u51fa\u5c06\u663e\u793a\u66f4\u6539\u53ca\u5176\u5185\u5bb9\u3002\u4e0a\u9762\u8f93\u51fa\u4e2d\u7a81\u51fa\u663e\u793a\u7684\u90e8\u5206\u662f\u66f4\u65b0\u6587\u4ef6\u4e2d\u7684\u66f4\u6539\u3002\u73b0\u5728\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u9884\u89c8\u66f4\u6539\u6765\u51b3\u5b9a\u662f\u5426\u8981\u50cf\u8fd9\u6837\u6682\u5b58\u6b64\u6587\u4ef6\u3002\n <\/div>\n

\n \u573a\u666f2: \u8ddf\u8e2a\u5df2\u6682\u5b58\u4f46\u5c1a\u672a\u63d0\u4ea4\u7684\u66f4\u6539:\n <\/div>\n

\n \u4f7f\u7528git diff\u547d\u4ee4\u53ef\u4ee5\u8ddf\u8e2a\u5df2\u6682\u5b58\u4f46\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u3002\u6211\u4eec\u53ef\u4ee5\u8ddf\u8e2a\u767b\u53f0\u533a\u57df\u4e2d\u7684\u66f4\u6539\u3002\u8981\u68c0\u67e5\u5df2\u7ecf\u6682\u5b58\u7684\u66f4\u6539\uff0c\u8bf7\u4f7f\u7528--staged\u9009\u9879\u548cgit diff\u547d\u4ee4\u3002\n <\/div>\n

\n \u8981\u68c0\u67e5\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\uff0c\u8bf7\u8fd0\u884cgit status\u547d\u4ee4\uff0c\u5982\u4e0b:\n <\/div>\n

$ git status<\/pre>\n<\/code>\n  <\/div>\n
\n    \u4ee5\u4e0a\u547d\u4ee4\u5c06\u663e\u793a\u5b58\u50a8\u5e93\u4e2d\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\u3002\u73b0\u5728\uff0c\u6211\u4eec\u5c06\u5176\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u57df\u3002\u8981\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u57df\uff0c\u8bf7\u8fd0\u884cgit add\u547d\u4ee4\uff0c\u5982\u4e0b\u6240\u793a:\n  <\/div>\n\n$ git add < file name><\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u4f1a\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u4e2d\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u73b0\u5728\uff0c\u6587\u4ef6\u5df2\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u4f46\u662f\u5c1a\u672a\u63d0\u4ea4\u3002\u56e0\u6b64\uff0c\u6211\u4eec\u4e5f\u53ef\u4ee5\u8ddf\u8e2a\u8fc7\u6e21\u533a\u57df\u4e2d\u7684\u53d8\u5316\u3002\u8981\u68c0\u67e5\u5206\u6bb5\u7684\u66f4\u6539\uff0c\u8bf7\u8fd0\u884cgit diff\u547d\u4ee4\u4ee5\u53ca-staged \u9009\u9879\u3002\u5b83\u5c06\u7528\u4f5c:\n  <\/div>\n\n$ git diff--staged<\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u663e\u793a\u5df2\u7ecf\u6682\u5b58\u7684\u6587\u4ef6\u7684\u66f4\u6539\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u7ed9\u5b9a\u7684\u8f93\u51fa\u6b63\u5728\u663e\u793anewfile1.txt\u7684\u66f4\u6539\uff0c\u8be5\u66f4\u6539\u5df2\u7ecf\u4e0a\u6f14\u4e86\u3002\n  <\/div>\n\n    \u573a\u666f3: \u63d0\u4ea4\u6587\u4ef6\u540e\u8ddf\u8e2a\u66f4\u6539:\n  <\/div>\n\n    Git\uff0c\u8ba9\u6211\u4eec\u8ddf\u8e2a\u6587\u4ef6\u63d0\u4ea4\u540e\u7684\u66f4\u6539\u3002\u5047\u8bbe\u6211\u4eec\u5df2\u7ecf\u4e3a\u5b58\u50a8\u5e93\u63d0\u4ea4\u4e86\u4e00\u4e2a\u6587\u4ef6\uff0c\u5e76\u5728\u63d0\u4ea4\u4e4b\u540e\u8fdb\u884c\u4e86\u4e00\u4e9b\u5176\u4ed6\u66f4\u6539\u3002\u56e0\u6b64\uff0c\u6211\u4eec\u4e5f\u53ef\u4ee5\u5728\u6b64\u9636\u6bb5\u8ddf\u8e2a\u6587\u4ef6\u3002\n  <\/div>\n\n    \u5728\u4e0b\u9762\u7684\u8f93\u51fa\u4e2d\uff0c\u6211\u4eec\u63d0\u4ea4\u4e86\u5bf9newfile1.txt\u6240\u505a\u7684\u66f4\u6539\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u73b0\u5728\uff0c\u6211\u4eec\u518d\u6b21\u5c06newfile.txt\u6587\u4ef6\u66f4\u6539\u4e3a\"\u63d0\u4ea4\u6587\u4ef6\u540e\u8fdb\u884c\u66f4\u6539\u3002\"\u8981\u8ddf\u8e2a\u6b64\u6587\u4ef6\u7684\u66f4\u6539\uff0c\u8bf7\u4f7f\u7528 HEAD \u53c2\u6570\u8fd0\u884cgit diff\u547d\u4ee4\u3002\u5b83\u5c06\u8fd0\u884c\u5982\u4e0b:\n  <\/div>\n\n $ git diff HEAD<\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u663e\u793a\u7ec8\u7aef\u4e2d\u7684\u66f4\u6539\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u6b63\u5728\u663e\u793a\u6587\u4ef6newfile1.txt\u7684\u66f4\u65b0\u3002\u5728\u7a81\u51fa\u663e\u793a\u7684\u90e8\u5206\u4e0a\u3002\n  <\/div>\n\n    \u65b9\u68484: \u8ddf\u8e2a\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539:\n  <\/div>\n\n    \u6211\u4eec\u53ef\u4ee5\u8ddf\u8e2a\u4e24\u6b21\u4e0d\u540c\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\u3002 Git\u5141\u8bb8\u6211\u4eec\u8ddf\u8e2a\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\uff0c\u65e0\u8bba\u662f\u6700\u65b0\u63d0\u4ea4\u8fd8\u662f\u65e7\u63d0\u4ea4\u3002\u4f46\u8fd9\u9700\u8981\u505a\u7684\u662f\uff0c\u6211\u4eec\u5fc5\u987b\u6709\u4e00\u4e2a\u63d0\u4ea4\u5217\u8868\uff0c\u4ee5\u4fbf\u6211\u4eec\u53ef\u4ee5\u8fdb\u884c\u6bd4\u8f83\u3002\u5728git log\u547d\u4ee4\u4e2d\u5217\u51fa\u63d0\u4ea4\u7684\u5e38\u7528\u547d\u4ee4\u3002\u8981\u663e\u793a\u6700\u8fd1\u7684\u63d0\u4ea4\uff0c\u6211\u4eec\u53ef\u4ee5\u8fd0\u884c\u4ee5\u4e0b\u547d\u4ee4:\n  <\/div>\n\n$ git log<\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u5217\u51fa\u6700\u8fd1\u7684\u63d0\u4ea4\u3002\n  <\/div>\n\n    \u5047\u8bbe\uff0c\u6211\u4eec\u60f3\u8ddf\u8e2a\u5148\u524d\u63d0\u4ea4\u4e2d\u6307\u5b9a\u7684\u66f4\u6539\u3002\u4e3a\u6b64\uff0c\u6211\u4eec\u5fc5\u987b\u63d0\u4ea4\u8be5\u6307\u5b9a\u6587\u4ef6\u3002\u8981\u663e\u793a\u4efb\u4f55\u6307\u5b9a\u7684\u63d0\u4ea4\uff0c\u8bf7\u8fd0\u884cgit log\u547d\u4ee4\uff0c\u5982\u4e0b\u6240\u793a:\n  <\/div>\n\n$ git log-p--follow--filename<\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u663e\u793a\u6307\u5b9a\u6587\u4ef6\u7684\u6240\u6709\u63d0\u4ea4\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u4ee5\u4e0a\u8f93\u51fa\u663e\u793a\u4e86newfile1.txt\u7684\u6240\u6709\u63d0\u4ea4\u3002\u5047\u8bbe\u6211\u4eec\u8981\u8ddf\u8e2a e553fc08cb \u548c f1ddc7c9e7 \u4e4b\u95f4\u7684\u66f4\u6539\u3002 git diff\u547d\u4ee4\u53ef\u4ee5\u8ddf\u8e2a\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\u3002\u547d\u4ee4\u5982\u4e0b:\n  <\/div>\n\n$ git diff <commit1-sha> <commit2-sha><\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u663e\u793a\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u4ee5\u4e0a\u8f93\u51fa\u663e\u793a\u4e86\u5bf9\u6240\u505a\u7684\u6240\u6709\u66f4\u6539newfile1.txt \u4ece\u63d0\u4ea4 e553fc08cb (\u6700\u65b0)\u5230\u63d0\u4ea4 f1ddc7c9e7 (\u5148\u524d)\u3002\n  <\/div>\n Git Diff\u5206\u652f<\/h2>\n\n    Git\u5141\u8bb8\u6bd4\u8f83\u5206\u652f\u3002\u5982\u679c\u60a8\u662f\u5206\u652f\u673a\u6784\u7684\u9ad8\u624b\uff0c\u90a3\u4e48\u60a8\u53ef\u4ee5\u4e86\u89e3\u5728\u5408\u5e76\u4e4b\u524d\u5206\u6790\u5206\u652f\u673a\u6784\u7684\u91cd\u8981\u6027\u3002\u5982\u679c\u60a8\u5408\u5e76\u5206\u652f\u800c\u4e0d\u8fdb\u884c\u6bd4\u8f83\uff0c\u5219\u4f1a\u4ea7\u751f\u8bb8\u591a\u51b2\u7a81\u3002\u56e0\u6b64\uff0c\u4e3a\u907f\u514d\u8fd9\u4e9b\u51b2\u7a81\uff0cGit\u5141\u8bb8\u8bb8\u591a\u65b9\u4fbf\u7684\u547d\u4ee4\u6765\u9884\u89c8\uff0c\u6bd4\u8f83\u548c\u7f16\u8f91\u66f4\u6539\u3002\n  <\/div>\n\n    \u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git status\u547d\u4ee4\u6765\u8ddf\u8e2a\u5206\u652f\u7684\u66f4\u6539\uff0c\u4f46\u662f\u5f88\u5c11\u6709\u547d\u4ee4\u53ef\u4ee5\u8be6\u7ec6\u89e3\u91ca\u5b83\u4e86\u3002 git diff\u547d\u4ee4\u662f\u8ddf\u8e2a\u66f4\u6539\u7684\u4e00\u79cd\u5e7f\u6cdb\u4f7f\u7528\u7684\u5de5\u5177\u3002\n  <\/div>\n\n    git diff\u547d\u4ee4\u5141\u8bb8\u6211\u4eec\u6bd4\u8f83\u5206\u652f\u548c\u5b58\u50a8\u5e93\u7684\u4e0d\u540c\u7248\u672c\u3002\u8981\u83b7\u5f97\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u8bf7\u6309\u4ee5\u4e0b\u65b9\u5f0f\u8fd0\u884cgit diff\u547d\u4ee4:\n  <\/div>\n\n$ git diff <branch 1> < branch 2><\/pre>\n<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06\u663e\u793a\u5206\u652f1\u548c\u5206\u652f2\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u56e0\u6b64\uff0c\u60a8\u53ef\u4ee5\u51b3\u5b9a\u662f\u5426\u8981\u5408\u5e76\u5206\u652f\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u4ee5\u4e0a\u8f93\u51fa\u663e\u793a\u4e86\u6211\u7684\u5b58\u50a8\u5e93\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02test \u548c test2 \u3002 git diff\u547d\u4ee4\u63d0\u4f9b\u4e24\u4e2a\u5206\u652f\u7684\u9884\u89c8\u3002\u56e0\u6b64\uff0c\u5bf9\u5206\u652f\u6267\u884c\u4efb\u4f55\u64cd\u4f5c\u5c06\u5f88\u6709\u5e2e\u52a9\u3002\n  <\/div>\n
\n <\/body>
\n<\/html><\/p>\n","protected":false},"excerpt":{"rendered":"Git Diffzh-cn","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[149],"tags":[],"class_list":["post-1639","post","type-post","status-publish","format-standard","hentry","category-gitjc"],"_links":{"self":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1639"}],"collection":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/comments?post=1639"}],"version-history":[{"count":0,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1639\/revisions"}],"wp:attachment":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/media?parent=1639"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/categories?post=1639"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/tags?post=1639"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}