{"id":21215,"date":"2024-11-19T13:05:13","date_gmt":"2024-11-19T05:05:13","guid":{"rendered":"https:\/\/fwq.ai\/blog\/21215\/"},"modified":"2024-11-19T13:05:13","modified_gmt":"2024-11-19T05:05:13","slug":"git%e6%8f%90%e4%ba%a4%e4%bf%a1%e6%81%af%e9%94%99%e8%af%af%e5%a6%82%e4%bd%95%e8%a1%a5%e6%95%91","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/21215\/","title":{"rendered":"git\u63d0\u4ea4\u4fe1\u606f\u9519\u8bef\u5982\u4f55\u8865\u6551"},"content":{"rendered":"<blockquote><p>\n  \u8981\u8865\u6551\u9519\u8bef\u7684 git \u63d0\u4ea4\u4fe1\u606f\uff0c\u6709\u4e09\u79cd\u65b9\u6cd5\uff1a\u63d0\u4ea4\u4fee\u6b63\uff1a\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u66ff\u6362\u73b0\u6709\u63d0\u4ea4\u3002\u91cd\u7f6e\u548c\u5f3a\u5236\u63a8\u9001\uff1a\u8986\u76d6\u73b0\u6709\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u91cd\u65b0\u63d0\u4ea4\u5e26\u6709\u6b63\u786e\u4fe1\u606f\u7684\u66f4\u6539\u3002\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u7f16\u8f91\u5668\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\uff0c\u5e76\u7528\u66f4\u65b0\u540e\u7684\u4fe1\u606f\u66ff\u6362\u9519\u8bef\u4fe1\u606f\u3002\n<\/p><\/blockquote>\n<p><img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/202404\/09\/2024040912332222760.jpg\" class=\"aligncenter\" title=\"git\u63d0\u4ea4\u4fe1\u606f\u9519\u8bef\u5982\u4f55\u8865\u6551\u63d2\u56fe\" alt=\"git\u63d0\u4ea4\u4fe1\u606f\u9519\u8bef\u5982\u4f55\u8865\u6551\u63d2\u56fe\" \/><\/p>\n<p><strong>\u5982\u4f55\u8865\u6551\u9519\u8bef\u7684 Git \u63d0\u4ea4\u4fe1\u606f<\/strong><\/p>\n<p>Git \u63d0\u4ea4\u4fe1\u606f\u5bf9\u4e8e\u4fdd\u6301\u6e05\u6670\u7684\u7248\u672c\u5386\u53f2\u548c\u8ddf\u8e2a\u4ee3\u7801\u5e93\u5185\u7684\u66f4\u6539\u975e\u5e38\u91cd\u8981\u3002\u7136\u800c\uff0c\u6709\u65f6\u5019\u6211\u4eec\u4f1a\u63d0\u4ea4\u5e26\u6709\u9519\u8bef\u4fe1\u606f\u7684\u4ee3\u7801\u3002\u5e78\u8fd0\u7684\u662f\uff0c\u6709\u51e0\u79cd\u65b9\u6cd5\u53ef\u4ee5\u8865\u6551\u8fd9\u4e9b\u9519\u8bef\u3002<\/p>\n<p><strong>\u65b9\u6cd5 1\uff1a\u901a\u8fc7\u63d0\u4ea4\u4fee\u6b63<\/strong><\/p>\n<ul>\n<li>\u4f7f\u7528  commit &#8211;amend \u547d\u4ee4\u3002<\/li>\n<li>\u8fd9\u5c06\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\uff0c\u5141\u8bb8\u60a8\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002<\/li>\n<li>\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u4fdd\u5b58\u66f4\u6539\u3002<\/li>\n<li>\u63d0\u4ea4\u4fee\u6b63\u5c06\u66ff\u6362\u4ee5\u524d\u7684\u63d0\u4ea4\uff0c\u5e76\u5e26\u6709\u66f4\u65b0\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u3002<\/li>\n<\/ul>\n<p><strong>\u65b9\u6cd5 2\uff1a\u901a\u8fc7\u91cd\u7f6e\u548c\u5f3a\u5236\u63a8\u9001<\/strong><\/p>\n<p><strong>\u6ce8\u610f\uff1a<\/strong>\u6b64\u65b9\u6cd5\u4f1a\u8986\u76d6\u73b0\u6709\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u56e0\u6b64\u8bf7\u8c28\u614e\u4f7f\u7528\u3002<\/p>\n<ul>\n<li>\u4f7f\u7528 git reset HEAD^ \u547d\u4ee4\u5c06 HEAD \u6307\u5411\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u3002<\/li>\n<li>\u5220\u9664\u5e26\u6709\u9519\u8bef\u4fe1\u606f\u7684\u63d0\u4ea4\u3002<\/li>\n<li>\u91cd\u65b0\u63d0\u4ea4\u66f4\u6539\uff0c\u5e26\u6709\u6b63\u786e\u7684\u63d0\u4ea4\u4fe1\u606f\u3002<\/li>\n<li>\u4f7f\u7528 git push &#8211;force \u547d\u4ee4\u5f3a\u5236\u63a8\u9001\u66f4\u65b0\u3002<\/li>\n<\/ul>\n<p><strong>\u65b9\u6cd5 3\uff1a\u901a\u8fc7\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2<\/strong><\/p>\n<ul>\n<li>\u4f7f\u7528 git rebase -i \u547d\u4ee4\u3002<\/li>\n<li>\u8fd9\u5c06\u6253\u5f00\u4e00\u4e2a\u4ea4\u4e92\u5f0f\u6587\u672c\u7f16\u8f91\u5668\uff0c\u5176\u4e2d\u5305\u542b\u63d0\u4ea4\u5386\u53f2\u7684\u5217\u8868\u3002<\/li>\n<li>\u5b9a\u4f4d\u9519\u8bef\u7684\u63d0\u4ea4\u5e76\u5bf9\u5176\u8fdb\u884c\u4fee\u6539\u3002<\/li>\n<li>\u4fdd\u5b58\u66f4\u6539\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002<\/li>\n<li>Git \u5c06\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2\uff0c\u7528\u66f4\u65b0\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u66ff\u6362\u9519\u8bef\u7684\u4fe1\u606f\u3002<\/li>\n<\/ul>\n<p><strong>\u63d0\u793a\uff1a<\/strong><\/p>\n<ul>\n<li>\u9075\u5faa Git \u63d0\u4ea4\u4fe1\u606f\u6307\u5357\uff0c\u4ee5\u7f16\u5199\u6e05\u6670\u3001\u7b80\u77ed\u3001\u6709\u610f\u4e49\u7684\u63d0\u4ea4\u4fe1\u606f\u3002<\/li>\n<li>\u5b9a\u671f\u5ba1\u67e5\u63d0\u4ea4\u5386\u53f2\uff0c\u4ee5\u8bc6\u522b\u548c\u4fee\u590d\u4efb\u4f55\u9519\u8bef\u3002<\/li>\n<li>\u4f7f\u7528 Git \u5de5\u5177\uff08\u5982 git filter-branch\uff09\u6765\u6267\u884c\u66f4\u9ad8\u7ea7\u7684\u63d0\u4ea4\u4fe1\u606f\u64cd\u4f5c\u3002<\/li>\n<\/ul>\n<p>\u4ee5\u4e0a\u5c31\u662f\u63d0\u4ea4\u4fe1\u606f\u9519\u8bef\u5982\u4f55\u8865\u6551\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\u8865\u6551\u9519\u8bef\u7684 git \u63d0\u4ea4\u4fe1\u606f\uff0c\u6709\u4e09\u79cd\u65b9\u6cd5\uff1a\u63d0\u4ea4\u4fee\u6b63\uff1a\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u66ff\u6362\u73b0\u6709\u63d0\u4ea4\u3002\u91cd\u7f6e\u548c\u5f3a\u5236\u63a8\u9001\uff1a\u8986\u76d6\u73b0\u6709\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u91cd\u65b0\u63d0\u4ea4\u5e26\u6709\u6b63\u786e\u4fe1\u606f\u7684\u66f4\u6539\u3002\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u7f16\u8f91\u5668\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\uff0c\u5e76\u7528\u66f4\u65b0\u540e\u7684\u4fe1\u606f\u66ff\u6362\u9519\u8bef\u4fe1\u606f\u3002 \u5982\u4f55\u8865\u6551\u9519\u8bef\u7684 Git \u63d0\u4ea4\u4fe1\u606f Git \u63d0\u4ea4\u4fe1\u606f\u5bf9\u4e8e\u4fdd\u6301\u6e05\u6670\u7684\u7248\u672c\u5386\u53f2\u548c\u8ddf\u8e2a\u4ee3\u7801\u5e93\u5185\u7684\u66f4\u6539\u975e\u5e38\u91cd\u8981\u3002\u7136\u800c\uff0c\u6709\u65f6\u5019\u6211\u4eec\u4f1a\u63d0\u4ea4\u5e26\u6709\u9519\u8bef\u4fe1\u606f\u7684\u4ee3\u7801\u3002\u5e78\u8fd0\u7684\u662f\uff0c\u6709\u51e0\u79cd\u65b9\u6cd5\u53ef\u4ee5\u8865\u6551\u8fd9\u4e9b\u9519\u8bef\u3002 \u65b9\u6cd5 1\uff1a\u901a\u8fc7\u63d0\u4ea4\u4fee\u6b63 \u4f7f\u7528 commit &#8211;amend \u547d\u4ee4\u3002 \u8fd9\u5c06\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\uff0c\u5141\u8bb8\u60a8\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002 \u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u4fdd\u5b58\u66f4\u6539\u3002 \u63d0\u4ea4\u4fee\u6b63\u5c06\u66ff\u6362\u4ee5\u524d\u7684\u63d0\u4ea4\uff0c\u5e76\u5e26\u6709\u66f4\u65b0\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u3002 \u65b9\u6cd5 2\uff1a\u901a\u8fc7\u91cd\u7f6e\u548c\u5f3a\u5236\u63a8\u9001 \u6ce8\u610f\uff1a\u6b64\u65b9\u6cd5\u4f1a\u8986\u76d6\u73b0\u6709\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u56e0\u6b64\u8bf7\u8c28\u614e\u4f7f\u7528\u3002 \u4f7f\u7528 git reset HEAD^ \u547d\u4ee4\u5c06 HEAD \u6307\u5411\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u3002 \u5220\u9664\u5e26\u6709\u9519\u8bef\u4fe1\u606f\u7684\u63d0\u4ea4\u3002 \u91cd\u65b0\u63d0\u4ea4\u66f4\u6539\uff0c\u5e26\u6709\u6b63\u786e\u7684\u63d0\u4ea4\u4fe1\u606f\u3002 \u4f7f\u7528 git push &#8211;force \u547d\u4ee4\u5f3a\u5236\u63a8\u9001\u66f4\u65b0\u3002 \u65b9\u6cd5 3\uff1a\u901a\u8fc7\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2 \u4f7f\u7528 git rebase -i \u547d\u4ee4\u3002 \u8fd9\u5c06\u6253\u5f00\u4e00\u4e2a\u4ea4\u4e92\u5f0f\u6587\u672c\u7f16\u8f91\u5668\uff0c\u5176\u4e2d\u5305\u542b\u63d0\u4ea4\u5386\u53f2\u7684\u5217\u8868\u3002 \u5b9a\u4f4d\u9519\u8bef\u7684\u63d0\u4ea4\u5e76\u5bf9\u5176\u8fdb\u884c\u4fee\u6539\u3002 \u4fdd\u5b58\u66f4\u6539\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002 Git \u5c06\u91cd\u65b0\u7f16\u5199\u63d0\u4ea4\u5386\u53f2\uff0c\u7528\u66f4\u65b0\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u66ff\u6362\u9519\u8bef\u7684\u4fe1\u606f\u3002 \u63d0\u793a\uff1a \u9075\u5faa Git \u63d0\u4ea4\u4fe1\u606f\u6307\u5357\uff0c\u4ee5\u7f16\u5199\u6e05\u6670\u3001\u7b80\u77ed\u3001\u6709\u610f\u4e49\u7684\u63d0\u4ea4\u4fe1\u606f\u3002 \u5b9a\u671f\u5ba1\u67e5\u63d0\u4ea4\u5386\u53f2\uff0c\u4ee5\u8bc6\u522b\u548c\u4fee\u590d\u4efb\u4f55\u9519\u8bef\u3002 \u4f7f\u7528 Git \u5de5\u5177\uff08\u5982 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-21215","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21215","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=21215"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21215\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=21215"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=21215"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=21215"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}