{"id":19270,"date":"2024-11-19T09:17:01","date_gmt":"2024-11-19T01:17:01","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19270\/"},"modified":"2024-11-19T09:17:01","modified_gmt":"2024-11-19T01:17:01","slug":"git%e6%80%8e%e4%b9%88%e6%9f%a5%e7%9c%8bcommit%e4%bf%ae%e6%94%b9%ef%bc%9f%e5%91%bd%e4%bb%a4%e5%88%86%e4%ba%ab","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19270\/","title":{"rendered":"git\u600e\u4e48\u67e5\u770bcommit\u4fee\u6539\uff1f\u547d\u4ee4\u5206\u4eab"},"content":{"rendered":"<p>git\u662f\u4e00\u79cd\u6700\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u662f\u5f00\u53d1\u4eba\u5458\u7684\u5fc5\u5907\u5de5\u5177\u3002\u5728git\u4e2d\uff0c\u6bcf\u4e2a\u4fee\u6539\u90fd\u4f1a\u88ab\u5b58\u50a8\u4e3a\u4e00\u6b21commit\u3002\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5b66\u4e60\u5982\u4f55\u67e5\u770bgit\u4e2d\u7684commit\u4fee\u6539\u3002<\/p>\n<p>\u9996\u5148\uff0c\u8ba9\u6211\u4eec\u4e86\u89e3\u4e00\u4e0bGit\u7684\u57fa\u672c\u6982\u5ff5\uff1a<\/p>\n<ul>\n<li>Repository\uff1aGit\u4ed3\u5e93\uff0c\u5373\u4f60\u7684\u9879\u76ee\u6587\u4ef6\u5939\u3002<\/li>\n<li>Commit\uff1aGit\u4e2d\u7684\u4fee\u6539\u8bb0\u5f55\uff0c\u5305\u62ec\u4e86\u4fee\u6539\u7684\u4f5c\u8005\u3001\u63cf\u8ff0\u548c\u65f6\u95f4\u6233\u7b49\u4fe1\u606f\u3002<\/li>\n<li>Branch\uff1aGit\u4e2d\u7684\u5206\u652f\uff0c\u4e3b\u8981\u7528\u4e8e\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u5bf9\u4ee3\u7801\u7684\u5206\u79bb\u548c\u7ba1\u7406\u3002<\/li>\n<li>Merge\uff1a\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u8fc7\u7a0b\u3002<\/li>\n<\/ul>\n<p>\u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u5c06\u4ecb\u7ecd\u51e0\u79cdGit\u547d\u4ee4\u6765\u67e5\u770bcommit\u4fee\u6539\uff1a<\/p>\n<ol>\n<li>git log<\/li>\n<\/ol>\n<p>\u547d\u4ee4git log\u53ef\u4ee5\u5217\u51fa\u4ed3\u5e93\u4e2d\u7684\u6240\u6709commit\u8bb0\u5f55\uff0c\u5176\u4e2d\u5305\u62ec\u6bcf\u6b21commit\u7684\u4fee\u6539\u4f5c\u8005\u3001\u63cf\u8ff0\u548c\u65f6\u95f4\u6233\u7b49\u4fe1\u606f\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u67e5\u770bcommit\u8bb0\u5f55\uff1a<\/p>\n<pre>$ git log<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u53ef\u4ee5\u5217\u51fa\u6240\u6709commit\u8bb0\u5f55\uff0c\u5e76\u4ece\u6700\u8fd1\u7684\u8bb0\u5f55\u5f00\u59cb\u3002\u4f60\u4e5f\u53ef\u4ee5\u4f7f\u7528\u4e00\u4e9b\u53c2\u6570\u6765\u9650\u5236\u663e\u793a\u4fe1\u606f\u7684\u6570\u91cf\u6216\u7b5b\u9009commit\u8bb0\u5f55\u3002\u4f8b\u5982\uff1a<\/p>\n<pre>$ git log -n 5<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u53ea\u663e\u793a\u6700\u8fd1\u76845\u4e2acommit\u8bb0\u5f55\u3002<\/p>\n<ol>\n<li>git show<\/li>\n<\/ol>\n<p>\u547d\u4ee4git show\u53ef\u4ee5\u663e\u793a\u6307\u5b9acommit\u7684\u8be6\u7ec6\u4fe1\u606f\uff0c\u5305\u62ec\u4fee\u6539\u7684\u5177\u4f53\u5185\u5bb9\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u663e\u793a\u67d0\u4e00\u6b21commit\u7684\u4fe1\u606f\uff1a<\/p>\n<pre>$ git show &lt;commit-id&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d\uff0c  \u662f\u8981\u67e5\u770bcommit\u7684ID\u53f7\u3002ID\u53f7\u53ef\u4ee5\u5728git log\u547d\u4ee4\u7684\u8f93\u51fa\u4e2d\u627e\u5230\u3002 <\/p>\n<ol>\n<li>git diff<\/li>\n<\/ol>\n<p>\u547d\u4ee4git diff\u7528\u4e8e\u6bd4\u8f83\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u6bd4\u8f83\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/p>\n<pre>$ git diff &lt;commit1&gt; &lt;commit2&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d\uff0c  \u548c  \u662f\u8981\u6bd4\u8f83\u7684\u4e24\u4e2acommit\u7684ID\u53f7\u3002\u8be5\u547d\u4ee4\u5c06\u8f93\u51fa\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\u3002  <\/p>\n<ol>\n<li>git bisect<\/li>\n<\/ol>\n<p>\u547d\u4ee4git bisect\u7528\u4e8e\u5728\u4e00\u4e2a\u5927\u7684commit\u5386\u53f2\u4e2d\u5feb\u901f\u5b9a\u4f4d\u4e00\u4e2a\u7279\u5b9a\u7684commit\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u8fd0\u884cgit bisect\uff1a<\/p>\n<pre>$ git bisect start<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u5f00\u59cb\u4e00\u4e2a\u65b0\u7684\u4e8c\u5206\u641c\u7d22\uff08\u4e8c\u5206\u67e5\u627e\u7b97\u6cd5\uff09\u3002\u60a8\u9700\u8981\u50cf\u5728\u4e8c\u5206\u641c\u7d22\u4e2d\u4e00\u6837\u544a\u8bc9Git\u5f53\u524d\u68c0\u67e5\u7684commit\u662f\u4e00\u4e2a\u201c\u574f\u201d\u7684commit\u8fd8\u662f\u4e00\u4e2a\u201c\u597d\u201d\u7684commit\u3002\u4f8b\u5982\uff1a<\/p>\n<pre>$ git bisect bad\n$ git bisect good &lt;commit-id&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d\uff0c  \u662f\u4f60\u8ba4\u4e3a\u662f\u201c\u597d\u201d\u7684commit\u7684ID\u53f7\u3002Git\u4f1a\u81ea\u52a8\u9009\u62e9\u5f53\u524dcommit\u5386\u53f2\u7684\u4e2d\u95f4\u70b9\uff0c\u5e76\u5c06\u60a8\u79fb\u52a8\u5230\u8be5\u70b9\u3002\u7136\u540e\uff0c\u4f60\u9700\u8981\u624b\u52a8\u6d4b\u8bd5\u4ee3\u7801\u4ee5\u786e\u5b9a\u8fd9\u4e2acommit\u662f\u201c\u597d\u201d\u8fd8\u662f\u201c\u574f\u201d\u3002\u6bcf\u6b21\u6d4b\u8bd5\u540e\uff0c\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u544a\u8bc9Git\uff1a <\/p>\n<pre>$ git bisect bad<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6216\uff1a<\/p>\n<pre>$ git bisect good<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>Git\u4f1a\u6839\u636e\u60a8\u7684\u53cd\u9988\u7ee7\u7eed\u8fdb\u884c\u4e8c\u5206\u641c\u7d22\uff0c\u76f4\u5230\u6700\u7ec8\u627e\u5230\u7cbe\u786e\u7684commit\u3002<\/p>\n<p>\u4ee5\u4e0a\u662f\u51e0\u79cd\u5e38\u7528\u7684Git\u547d\u4ee4\uff0c\u7528\u4e8e\u67e5\u770bcommit\u4fee\u6539\u3002\u5e0c\u671b\u8fd9\u7bc7\u6587\u7ae0\u80fd\u5e2e\u52a9\u4f60\u66f4\u597d\u5730\u4f7f\u7528Git\u6765\u7ba1\u7406\u4ee3\u7801\u7248\u672c\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u67e5\u770bcommit\u4fee\u6539\uff1f\u547d\u4ee4\u5206\u4eab\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>git\u662f\u4e00\u79cd\u6700\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u662f\u5f00\u53d1\u4eba\u5458\u7684\u5fc5\u5907\u5de5\u5177\u3002\u5728git\u4e2d\uff0c\u6bcf\u4e2a\u4fee\u6539\u90fd\u4f1a\u88ab\u5b58\u50a8\u4e3a\u4e00\u6b21commit\u3002\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5b66\u4e60\u5982\u4f55\u67e5\u770bgit\u4e2d\u7684commit\u4fee\u6539\u3002 \u9996\u5148\uff0c\u8ba9\u6211\u4eec\u4e86\u89e3\u4e00\u4e0bGit\u7684\u57fa\u672c\u6982\u5ff5\uff1a Repository\uff1aGit\u4ed3\u5e93\uff0c\u5373\u4f60\u7684\u9879\u76ee\u6587\u4ef6\u5939\u3002 Commit\uff1aGit\u4e2d\u7684\u4fee\u6539\u8bb0\u5f55\uff0c\u5305\u62ec\u4e86\u4fee\u6539\u7684\u4f5c\u8005\u3001\u63cf\u8ff0\u548c\u65f6\u95f4\u6233\u7b49\u4fe1\u606f\u3002 Branch\uff1aGit\u4e2d\u7684\u5206\u652f\uff0c\u4e3b\u8981\u7528\u4e8e\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u5bf9\u4ee3\u7801\u7684\u5206\u79bb\u548c\u7ba1\u7406\u3002 Merge\uff1a\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u8fc7\u7a0b\u3002 \u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u5c06\u4ecb\u7ecd\u51e0\u79cdGit\u547d\u4ee4\u6765\u67e5\u770bcommit\u4fee\u6539\uff1a git log \u547d\u4ee4git log\u53ef\u4ee5\u5217\u51fa\u4ed3\u5e93\u4e2d\u7684\u6240\u6709commit\u8bb0\u5f55\uff0c\u5176\u4e2d\u5305\u62ec\u6bcf\u6b21commit\u7684\u4fee\u6539\u4f5c\u8005\u3001\u63cf\u8ff0\u548c\u65f6\u95f4\u6233\u7b49\u4fe1\u606f\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u67e5\u770bcommit\u8bb0\u5f55\uff1a $ git log \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u53ef\u4ee5\u5217\u51fa\u6240\u6709commit\u8bb0\u5f55\uff0c\u5e76\u4ece\u6700\u8fd1\u7684\u8bb0\u5f55\u5f00\u59cb\u3002\u4f60\u4e5f\u53ef\u4ee5\u4f7f\u7528\u4e00\u4e9b\u53c2\u6570\u6765\u9650\u5236\u663e\u793a\u4fe1\u606f\u7684\u6570\u91cf\u6216\u7b5b\u9009commit\u8bb0\u5f55\u3002\u4f8b\u5982\uff1a $ git log -n 5 \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u53ea\u663e\u793a\u6700\u8fd1\u76845\u4e2acommit\u8bb0\u5f55\u3002 git show \u547d\u4ee4git show\u53ef\u4ee5\u663e\u793a\u6307\u5b9acommit\u7684\u8be6\u7ec6\u4fe1\u606f\uff0c\u5305\u62ec\u4fee\u6539\u7684\u5177\u4f53\u5185\u5bb9\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u663e\u793a\u67d0\u4e00\u6b21commit\u7684\u4fe1\u606f\uff1a $ git show &lt;commit-id&gt; \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c \u662f\u8981\u67e5\u770bcommit\u7684ID\u53f7\u3002ID\u53f7\u53ef\u4ee5\u5728git log\u547d\u4ee4\u7684\u8f93\u51fa\u4e2d\u627e\u5230\u3002 git diff \u547d\u4ee4git diff\u7528\u4e8e\u6bd4\u8f83\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u6bd4\u8f83\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a $ git diff &lt;commit1&gt; &lt;commit2&gt; \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c \u548c \u662f\u8981\u6bd4\u8f83\u7684\u4e24\u4e2acommit\u7684ID\u53f7\u3002\u8be5\u547d\u4ee4\u5c06\u8f93\u51fa\u4e24\u4e2acommit\u4e4b\u95f4\u7684\u5dee\u5f02\u3002 git bisect \u547d\u4ee4git bisect\u7528\u4e8e\u5728\u4e00\u4e2a\u5927\u7684commit\u5386\u53f2\u4e2d\u5feb\u901f\u5b9a\u4f4d\u4e00\u4e2a\u7279\u5b9a\u7684commit\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u6765\u8fd0\u884cgit bisect\uff1a $ git [&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-19270","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19270","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=19270"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19270\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19270"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19270"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19270"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}