{"id":20354,"date":"2024-11-19T12:50:15","date_gmt":"2024-11-19T04:50:15","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20354\/"},"modified":"2024-11-19T12:50:15","modified_gmt":"2024-11-19T04:50:15","slug":"git%e6%b8%85%e9%99%a4%e5%8e%86%e5%8f%b2%e7%ba%aa%e5%bd%95","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20354\/","title":{"rendered":"git\u6e05\u9664\u5386\u53f2\u7eaa\u5f55"},"content":{"rendered":"<p>git \u662f\u4e00\u79cd\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u88ab\u5e7f\u6cdb\u7528\u4e8e\u9879\u76ee\u5f00\u53d1\u4e2d\u3002\u5728\u9879\u76ee\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u901a\u5e38\u4f1a\u4f7f\u7528\u5404\u79cd git \u547d\u4ee4\u6765\u8fdb\u884c\u7248\u672c\u63a7\u5236\u548c\u7ba1\u7406\uff0c\u5176\u4e2d\u5305\u62ec\u63d0\u4ea4\u4ee3\u7801\uff0c\u5408\u5e76\u5206\u652f\u7b49\u64cd\u4f5c\u3002\u7136\u800c\uff0c\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u53ef\u80fd\u9700\u8981\u6e05\u9664 git \u5386\u53f2\u7eaa\u5f55\uff0c\u6bd4\u5982\u5220\u9664\u654f\u611f\u4fe1\u606f\u6216\u6e05\u9664\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u4e0b\u9762\u6211\u4eec\u5c06\u8ba8\u8bba\u5982\u4f55\u6e05\u9664 git \u7684\u5386\u53f2\u7eaa\u5f55\u3002<\/p>\n<p>\u4e00\u3001\u5907\u4efd<\/p>\n<p>\u5728\u6267\u884c Git \u5386\u53f2\u7eaa\u5f55\u6e05\u9664\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u8fdb\u884c\u5907\u4efd\uff0c\u4ee5\u9632\u6b62\u64cd\u4f5c\u51fa\u73b0\u9519\u8bef\u6216\u610f\u5916\u60c5\u51b5\u3002\u5c06\u5f53\u524d\u4ee3\u7801\u5e93\u5907\u4efd\u5230\u4e00\u4e2a\u5b89\u5168\u7684\u5730\u65b9\u662f\u5f88\u91cd\u8981\u7684\uff0c\u4ee5\u4fbf\u6211\u4eec\u53ef\u4ee5\u5728\u9700\u8981\u65f6\u8fd8\u539f\u6211\u4eec\u7684\u4ee3\u7801\u5e93\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 Git \u7684\u6253\u5305\u547d\u4ee4\u5c06\u9879\u76ee\u5907\u4efd\u5230\u4e00\u4e2a\u538b\u7f29\u6587\u4ef6\u4e2d\uff0c\u4f8b\u5982\uff1a<\/p>\n<pre>git archive --format zip --output backup.zip HEAD<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06\u5f53\u524d\u4ee3\u7801\u5e93\u6253\u5305\u6210\u4e00\u4e2a ZIP \u6587\u4ef6\uff0c\u5e76\u5c06\u5176\u4fdd\u5b58\u5230 backup.zip \u4e2d\u3002<\/p>\n<p>\u4e8c\u3001\u6e05\u9664\u5386\u53f2\u7eaa\u5f55<\/p>\n<ol>\n<li>\u4f7f\u7528\u547d\u4ee4\u6e05\u9664\u5355\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u7eaa\u5f55<\/li>\n<\/ol>\n<p>\u5220\u9664\u5355\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u7eaa\u5f55\u662f\u4e00\u9879\u76f8\u5bf9\u7b80\u5355\u7684\u64cd\u4f5c\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u5b9e\u73b0\uff1a<\/p>\n<pre>$ git filter-branch --index-filter 'git rm --cached --ignore-unmatch path\/to\/file' --prune-empty -- --all<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06\u76ee\u6807\u6587\u4ef6\u4ece\u5386\u53f2\u7eaa\u5f55\u4e2d\u5f7b\u5e95\u5220\u9664\u3002\u5176\u4e2d\uff0cpath\/to\/file \u8868\u793a\u8981\u6e05\u9664\u7684\u6587\u4ef6\u8def\u5f84\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528\u547d\u4ee4\u6e05\u9664 commit \u7684\u5386\u53f2\u7eaa\u5f55<\/li>\n<\/ol>\n<p>\u6709\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u5220\u9664\u67d0\u4e2a commit \u53ca\u5176\u4e4b\u540e\u7684\u5386\u53f2\u7eaa\u5f55\u3002\u4e3a\u6b64\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 Git \u7684 rebase \u547d\u4ee4\u6765\u5b9e\u73b0\u3002\u5177\u4f53\u6765\u8bf4\uff0c\u6211\u4eec\u9700\u8981\u6267\u884c\u4ee5\u4e0b\u6b65\u9aa4\uff1a<\/p>\n<p>1\uff09\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c55\u793a\u9879\u76ee\u4e2d\u6240\u6709\u7684 commit<\/p>\n<pre>$ git log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u663e\u793a\u9879\u76ee\u4e2d\u6240\u6709\u7684 commit \u8bb0\u5f55\u3002<\/p>\n<p>2\uff09\u51b3\u5b9a\u8981\u6e05\u9664\u7684 commit \u7684 SHA \u503c<\/p>\n<p>\u6211\u4eec\u9700\u8981\u67e5\u627e\u8981\u5220\u9664 commit \u7684 SHA \u503c\uff0c\u53ef\u4ee5\u4ece\u4e0b\u9762\u7684 commit \u65e5\u5fd7\u4e2d\u83b7\u53d6\uff1a<\/p>\n<pre>commit 55d4d98de4caf2ac1a8f783624c58e533500f3d7\nAuthor: John Doe &lt;john&gt;\nDate:   Fri Apr 30 16:01:07 2021 -0700\n\n    Added new feature&lt;\/john&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u4e0a\u8ff0\u793a\u4f8b\u4e2d\u7684 commit SHA \u503c\u662f 55d4d98de4caf2ac1a8f783624c58e533500f3d7.<\/p>\n<p>3\uff09\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u8981\u6e05\u9664\u7684 commit \u5f39\u51fa<\/p>\n<pre>$ git rebase -i &lt;commit-hash&gt;^&lt;\/commit-hash&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6bd4\u5982\uff0c\u6211\u4eec\u8981\u5220\u9664 SHA \u503c\u4e3a 55d4d98de4caf2ac1a8f783624c58e533500f3d7 \u7684 commit \u53ca\u5176\u4e4b\u540e\u7684\u5386\u53f2\u7eaa\u5f55\uff0c\u53ef\u4ee5\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n<pre>$ git rebase -i 55d4d98de4caf2ac1a8f783624c58e533500f3d7^<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>4\uff09\u7f16\u8f91\u4ea4\u4e92\u7a97\u53e3\u4ee5\u5c06\u76ee\u6807 commit \u5f39\u51fa<\/p>\n<p>\u5728\u4ea4\u4e92\u6a21\u5f0f\u4e2d\uff0c\u6211\u4eec\u9700\u8981\u5c06\u9700\u8981\u5220\u9664\u7684\u76ee\u6807 commit \u6807\u8bb0\u4e3a \u201cdrop\u201d\uff0c\u7136\u540e\u5c06\u6587\u4ef6\u4fdd\u5b58\u9000\u51fa\u5373\u53ef\u3002\u793a\u4f8b\u5982\u4e0b\u6240\u793a\uff1a<\/p>\n<pre>pick 44a0c2c this is an invalid commit, which should be removed\ndrop 55d4d98 Added new feature<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5728\u4e0a\u4f8b\u4e2d\uff0c55d4d98 \u5386\u53f2\u7eaa\u5f55\u5c06\u88ab\u5220\u9664\uff0c\u800c 44a0c2c \u5386\u53f2\u7eaa\u5f55\u5c06\u6210\u4e3a\u6700\u65b0\u7684 commit\u3002<\/p>\n<p>5\uff09\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6e05\u9664\u65e7\u7684\u5386\u53f2\u7eaa\u5f55<\/p>\n<pre>$ git filter-branch --force --prune-empty --index-filter 'git rm -rf --cached --ignore-unmatch .\/' --tag-name-filter cat -- --all<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u6e05\u9664\u6389\u88ab\u6807\u8bb0\u4e3a \u201cdrop\u201d \u7684 commit \u53ca\u5176\u4e4b\u540e\u7684 commit\u3002<\/p>\n<p>6\uff09\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n<p>\u6700\u540e\uff0c\u6211\u4eec\u9700\u8981\u5f3a\u5236\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u4ee5\u66f4\u65b0\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684\u5386\u53f2\u7eaa\u5f55\uff0c\u4fdd\u8bc1\u5386\u53f2\u8bb0\u5f55\u7684\u6b63\u786e\u6027\uff1a<\/p>\n<pre>$ git push origin --force --all<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8bf7\u6ce8\u610f\uff0c\u5728\u6267\u884c\u4ee5\u4e0a\u547d\u4ee4\u65f6\u5e94\u8c28\u614e\u64cd\u4f5c\uff0c\u5e76\u786e\u4fdd\u5df2\u5907\u4efd\u4ee3\u7801\u5e93\u3002\u56e0\u4e3a\u4e00\u65e6\u5220\u9664\uff0c\u5c31\u65e0\u6cd5\u6062\u590d\u3002<\/p>\n<p>\u603b\u7ed3<\/p>\n<p>\u672c\u6587\u4ecb\u7ecd\u4e86\u5982\u4f55\u4f7f\u7528 Git \u6e05\u9664\u5386\u53f2\u7eaa\u5f55\u7684\u65b9\u6cd5\u3002\u5728\u6267\u884c\u8fd9\u4e9b\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u8003\u8651\u5230\u5bf9\u5386\u53f2\u7eaa\u5f55\u64cd\u4f5c\u7684\u540e\u679c\uff0c\u5e76\u8fdb\u884c\u5907\u4efd\u4ee5\u907f\u514d\u4e0d\u53ef\u9006\u7684\u635f\u5931\u3002\u540c\u65f6\uff0c\u6211\u4eec\u5e94\u8be5\u5c3d\u91cf\u907f\u514d\u5bf9\u5386\u53f2\u7eaa\u5f55\u8fdb\u884c\u6e05\u9664\u64cd\u4f5c\uff0c\u53ea\u5728\u5fc5\u8981\u65f6\u4f7f\u7528\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit\u6e05\u9664\u5386\u53f2\u7eaa\u5f55\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\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u88ab\u5e7f\u6cdb\u7528\u4e8e\u9879\u76ee\u5f00\u53d1\u4e2d\u3002\u5728\u9879\u76ee\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u901a\u5e38\u4f1a\u4f7f\u7528\u5404\u79cd git \u547d\u4ee4\u6765\u8fdb\u884c\u7248\u672c\u63a7\u5236\u548c\u7ba1\u7406\uff0c\u5176\u4e2d\u5305\u62ec\u63d0\u4ea4\u4ee3\u7801\uff0c\u5408\u5e76\u5206\u652f\u7b49\u64cd\u4f5c\u3002\u7136\u800c\uff0c\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u53ef\u80fd\u9700\u8981\u6e05\u9664 git \u5386\u53f2\u7eaa\u5f55\uff0c\u6bd4\u5982\u5220\u9664\u654f\u611f\u4fe1\u606f\u6216\u6e05\u9664\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u4e0b\u9762\u6211\u4eec\u5c06\u8ba8\u8bba\u5982\u4f55\u6e05\u9664 git \u7684\u5386\u53f2\u7eaa\u5f55\u3002 \u4e00\u3001\u5907\u4efd \u5728\u6267\u884c Git \u5386\u53f2\u7eaa\u5f55\u6e05\u9664\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u8fdb\u884c\u5907\u4efd\uff0c\u4ee5\u9632\u6b62\u64cd\u4f5c\u51fa\u73b0\u9519\u8bef\u6216\u610f\u5916\u60c5\u51b5\u3002\u5c06\u5f53\u524d\u4ee3\u7801\u5e93\u5907\u4efd\u5230\u4e00\u4e2a\u5b89\u5168\u7684\u5730\u65b9\u662f\u5f88\u91cd\u8981\u7684\uff0c\u4ee5\u4fbf\u6211\u4eec\u53ef\u4ee5\u5728\u9700\u8981\u65f6\u8fd8\u539f\u6211\u4eec\u7684\u4ee3\u7801\u5e93\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 Git \u7684\u6253\u5305\u547d\u4ee4\u5c06\u9879\u76ee\u5907\u4efd\u5230\u4e00\u4e2a\u538b\u7f29\u6587\u4ef6\u4e2d\uff0c\u4f8b\u5982\uff1a git archive &#8211;format zip &#8211;output backup.zip HEAD \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06\u5f53\u524d\u4ee3\u7801\u5e93\u6253\u5305\u6210\u4e00\u4e2a ZIP \u6587\u4ef6\uff0c\u5e76\u5c06\u5176\u4fdd\u5b58\u5230 backup.zip \u4e2d\u3002 \u4e8c\u3001\u6e05\u9664\u5386\u53f2\u7eaa\u5f55 \u4f7f\u7528\u547d\u4ee4\u6e05\u9664\u5355\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u7eaa\u5f55 \u5220\u9664\u5355\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u7eaa\u5f55\u662f\u4e00\u9879\u76f8\u5bf9\u7b80\u5355\u7684\u64cd\u4f5c\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u5b9e\u73b0\uff1a $ git filter-branch &#8211;index-filter &#8216;git rm &#8211;cached &#8211;ignore-unmatch path\/to\/file&#8217; &#8211;prune-empty &#8212; &#8211;all \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06\u76ee\u6807\u6587\u4ef6\u4ece\u5386\u53f2\u7eaa\u5f55\u4e2d\u5f7b\u5e95\u5220\u9664\u3002\u5176\u4e2d\uff0cpath\/to\/file \u8868\u793a\u8981\u6e05\u9664\u7684\u6587\u4ef6\u8def\u5f84\u3002 \u4f7f\u7528\u547d\u4ee4\u6e05\u9664 commit \u7684\u5386\u53f2\u7eaa\u5f55 \u6709\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u5220\u9664\u67d0\u4e2a commit \u53ca\u5176\u4e4b\u540e\u7684\u5386\u53f2\u7eaa\u5f55\u3002\u4e3a\u6b64\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 Git \u7684 rebase \u547d\u4ee4\u6765\u5b9e\u73b0\u3002\u5177\u4f53\u6765\u8bf4\uff0c\u6211\u4eec\u9700\u8981\u6267\u884c\u4ee5\u4e0b\u6b65\u9aa4\uff1a [&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-20354","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20354","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=20354"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20354\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20354"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20354"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20354"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}