{"id":21188,"date":"2024-11-19T11:03:31","date_gmt":"2024-11-19T03:03:31","guid":{"rendered":"https:\/\/fwq.ai\/blog\/21188\/"},"modified":"2024-11-19T11:03:31","modified_gmt":"2024-11-19T03:03:31","slug":"git%e6%80%8e%e4%b9%88%e5%af%b9%e6%af%94%e4%b8%a4%e4%b8%aa%e7%89%88%e6%9c%ac%e7%9a%84%e6%96%87%e4%bb%b6%e5%86%85%e5%ae%b9","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/21188\/","title":{"rendered":"git\u600e\u4e48\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684\u6587\u4ef6\u5185\u5bb9"},"content":{"rendered":"<blockquote><p>\n  \u8981\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684 git \u6587\u4ef6\uff0c\u8bf7\u4f7f\u7528 git diff \u547d\u4ee4\uff1agit diff \u6bd4\u8f83\u5de5\u4f5c\u6811\u548c\u6682\u5b58\u533a\u4e4b\u95f4\u7684\u5dee\u5f02\u3002git diff \u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4\u6216\u6807\u7b7e\u4e4b\u95f4\u7684\u5dee\u5f02\u3002git diff \u8f93\u51fa\u663e\u793a\u5dee\u5f02\u5757\uff0c\u5176\u4e2d + \u8868\u793a\u6dfb\u52a0\u7684\u884c\uff0c- \u8868\u793a\u5220\u9664\u7684\u884c\uff0c \u8868\u793a\u4fee\u6539\u7684\u884c\u3002\u53ef\u4f7f\u7528 gitkraken\u3001meld\u3001beyond compare \u7b49\u53ef\u89c6\u5316\u5de5\u5177\u66f4\u76f4\u89c2\u5730\u67e5\u770b\u5dee\u5f02\u3002\n<\/p><\/blockquote>\n<p><img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/202404\/09\/2024040910571945943.jpg\" class=\"aligncenter\" title=\"git\u600e\u4e48\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684\u6587\u4ef6\u5185\u5bb9\u63d2\u56fe\" alt=\"git\u600e\u4e48\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684\u6587\u4ef6\u5185\u5bb9\u63d2\u56fe\" \/><\/p>\n<p><strong>\u5982\u4f55\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684 Git \u6587\u4ef6\u5185\u5bb9<\/strong><\/p>\n<p>\u4f7f\u7528 Git \u65f6\uff0c\u7ecf\u5e38\u9700\u8981\u6bd4\u8f83\u4e24\u4e2a\u4e0d\u540c\u7248\u672c\u7684\u540c\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\u3002\u4ee5\u4e0b\u662f\u5982\u4f55\u4f7f\u7528 Git \u8f7b\u677e\u5bf9\u6bd4\u6587\u4ef6\u5185\u5bb9\uff1a<\/p>\n<p><strong>1. \u68c0\u67e5\u6587\u4ef6\u7684\u72b6\u6001<\/strong><\/p>\n<p>\u9996\u5148\uff0c\u786e\u8ba4\u8981\u6bd4\u8f83\u7684\u6587\u4ef6\u5df2\u63d0\u4ea4\u5230\u3002\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u68c0\u67e5\u6587\u4ef6\u7684\u72b6\u6001\uff1a<\/p>\n<pre>git status<\/pre>\n<p> \u767b\u5f55\u540e\u590d\u5236 <\/p>\n<p><strong>2. \u4f7f\u7528  diff<\/strong><\/p>\n<p>\u8981\u6bd4\u8f83\u4e24\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u8bf7\u4f7f\u7528 git diff \u547d\u4ee4\u3002\u6b64\u547d\u4ee4\u6709\u4e24\u79cd\u5e38\u7528\u8bed\u6cd5\uff1a<\/p>\n<ul>\n<li><strong>\u6bd4\u8f83\u5de5\u4f5c\u6811\u548c\u6682\u5b58\u533a\uff08\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff09\uff1a<\/strong><\/li>\n<\/ul>\n<pre>git diff<\/pre>\n<p> \u767b\u5f55\u540e\u590d\u5236 <\/p>\n<ul>\n<li><strong>\u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4\u6216\u6807\u7b7e\uff1a<\/strong><\/li>\n<\/ul>\n<pre>git diff &lt;commit-ish 1&gt; &lt;commit-ish 2&gt;<\/pre>\n<p> \u767b\u5f55\u540e\u590d\u5236 <\/p>\n<p>\u4f8b\u5982\uff0c\u8981\u6bd4\u8f83\u5f53\u524d\u6682\u5b58\u533a\u548c\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/p>\n<pre>git diff HEAD<\/pre>\n<p> \u767b\u5f55\u540e\u590d\u5236 <\/p>\n<p><strong>3. \u7406\u89e3 diff \u8f93\u51fa<\/strong><\/p>\n<p>git diff \u8f93\u51fa\u663e\u793a\u6587\u4ef6\u4e2d\u7684\u5dee\u5f02\u3002\u6bcf\u4e2a\u5dee\u5f02\u5757\u4ee5\u4ee5\u4e0b\u683c\u5f0f\u5f00\u5934\uff1a<\/p>\n<pre>@@ -&lt;start line number&gt;,&lt;number of lines removed&gt; +&lt;start line number&gt;,&lt;number of lines added&gt; @@<\/pre>\n<p> \u767b\u5f55\u540e\u590d\u5236 <\/p>\n<p>\u8fd9\u8868\u793a\u8be5\u5757\u4e2d\u5220\u9664\u4e86\u4ece\u539f\u59cb\u6587\u4ef6\u4e2d\u7684\u7b2c \u884c\u5f00\u59cb\u7684 \u884c\uff0c\u5e76\u5728\u65b0\u7248\u672c\u4e2d\u7b2c \u884c\u4e4b\u540e\u6dfb\u52a0\u4e86 \u884c\u3002 <\/p>\n<p><strong>4. \u67e5\u770b\u5dee\u5f02\u8be6\u60c5<\/strong><\/p>\n<p>\u5dee\u5f02\u5757\u4e2d\u7684\u6bcf\u4e2a\u884c\u90fd\u4ee5\u4ee5\u4e0b\u5b57\u7b26\u5f00\u5934\uff0c\u8868\u793a\u8be5\u884c\u7684\u66f4\u6539\u7c7b\u578b\uff1a<\/p>\n<ul>\n<li>+ &#8211; \u65b0\u6dfb\u52a0\u7684\u6587\u672c<\/li>\n<li>&#8211; &#8211; \u5df2\u5220\u9664\u7684\u6587\u672c<\/li>\n<li> &#8211; \u4fee\u6539\u8fc7\u7684\u6587\u672c<\/li>\n<\/ul>\n<p><strong>5. \u4f7f\u7528\u53ef\u89c6\u5316\u5de5\u5177<\/strong><\/p>\n<p>\u9664\u4e86\u6587\u672c\u8f93\u51fa\u4e4b\u5916\uff0c\u8fd8\u53ef\u4ee5\u4f7f\u7528\u53ef\u89c6\u5316\u5de5\u5177\u6765\u6bd4\u8f83\u6587\u4ef6\u5dee\u5f02\u3002\u4e00\u4e9b\u6d41\u884c\u7684\u5de5\u5177\u5305\u62ec\uff1a<\/p>\n<ul>\n<li>GitKraken<\/li>\n<li>Meld<\/li>\n<li>Beyond Compare<\/li>\n<\/ul>\n<p>\u8fd9\u4e9b\u5de5\u5177\u63d0\u4f9b\u5e76\u6392\u89c6\u56fe\uff0c\u4f7f\u60a8\u53ef\u4ee5\u8f7b\u677e\u67e5\u770b\u6587\u4ef6\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u600e\u4e48\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684\u6587\u4ef6\u5185\u5bb9\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":"<p>\u8981\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684 git \u6587\u4ef6\uff0c\u8bf7\u4f7f\u7528 git diff \u547d\u4ee4\uff1agit diff \u6bd4\u8f83\u5de5\u4f5c\u6811\u548c\u6682\u5b58\u533a\u4e4b\u95f4\u7684\u5dee\u5f02\u3002git diff \u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4\u6216\u6807\u7b7e\u4e4b\u95f4\u7684\u5dee\u5f02\u3002git diff \u8f93\u51fa\u663e\u793a\u5dee\u5f02\u5757\uff0c\u5176\u4e2d + \u8868\u793a\u6dfb\u52a0\u7684\u884c\uff0c- \u8868\u793a\u5220\u9664\u7684\u884c\uff0c \u8868\u793a\u4fee\u6539\u7684\u884c\u3002\u53ef\u4f7f\u7528 gitkraken\u3001meld\u3001beyond compare \u7b49\u53ef\u89c6\u5316\u5de5\u5177\u66f4\u76f4\u89c2\u5730\u67e5\u770b\u5dee\u5f02\u3002 \u5982\u4f55\u5bf9\u6bd4\u4e24\u4e2a\u7248\u672c\u7684 Git \u6587\u4ef6\u5185\u5bb9 \u4f7f\u7528 Git \u65f6\uff0c\u7ecf\u5e38\u9700\u8981\u6bd4\u8f83\u4e24\u4e2a\u4e0d\u540c\u7248\u672c\u7684\u540c\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\u3002\u4ee5\u4e0b\u662f\u5982\u4f55\u4f7f\u7528 Git \u8f7b\u677e\u5bf9\u6bd4\u6587\u4ef6\u5185\u5bb9\uff1a 1. \u68c0\u67e5\u6587\u4ef6\u7684\u72b6\u6001 \u9996\u5148\uff0c\u786e\u8ba4\u8981\u6bd4\u8f83\u7684\u6587\u4ef6\u5df2\u63d0\u4ea4\u5230\u3002\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u68c0\u67e5\u6587\u4ef6\u7684\u72b6\u6001\uff1a git status \u767b\u5f55\u540e\u590d\u5236 2. \u4f7f\u7528 diff \u8981\u6bd4\u8f83\u4e24\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u8bf7\u4f7f\u7528 git diff \u547d\u4ee4\u3002\u6b64\u547d\u4ee4\u6709\u4e24\u79cd\u5e38\u7528\u8bed\u6cd5\uff1a \u6bd4\u8f83\u5de5\u4f5c\u6811\u548c\u6682\u5b58\u533a\uff08\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff09\uff1a git diff \u767b\u5f55\u540e\u590d\u5236 \u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4\u6216\u6807\u7b7e\uff1a git diff &lt;commit-ish 1&gt; &lt;commit-ish 2&gt; \u767b\u5f55\u540e\u590d\u5236 \u4f8b\u5982\uff0c\u8981\u6bd4\u8f83\u5f53\u524d\u6682\u5b58\u533a\u548c\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a git diff [&hellip;]<\/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-21188","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21188","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=21188"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21188\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=21188"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=21188"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=21188"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}