{"id":19252,"date":"2024-11-19T16:11:38","date_gmt":"2024-11-19T08:11:38","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19252\/"},"modified":"2024-11-19T16:11:38","modified_gmt":"2024-11-19T08:11:38","slug":"%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8git-revert%e5%91%bd%e4%bb%a4%e6%92%a4%e9%94%80%e4%b9%8b%e5%89%8d%e7%9a%84%e6%8f%90%e4%ba%a4","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19252\/","title":{"rendered":"\u5982\u4f55\u4f7f\u7528Git revert\u547d\u4ee4\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4"},"content":{"rendered":"<p>\u5728\u4f7f\u7528git\u8fdb\u884c\u4ee3\u7801\u7248\u672c\u63a7\u5236\u65f6\uff0c\u4e0d\u53ef\u907f\u514d\u5730\u4f1a\u51fa\u73b0\u9700\u8981\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u7684\u60c5\u51b5\u3002git\u63d0\u4f9b\u4e86\u591a\u79cd\u65b9\u5f0f\u6765\u64a4\u9500\u5df2\u7ecf\u63d0\u4ea4\u7684\u4ee3\u7801\u66f4\u6539\uff0c\u5176\u4e2d\u4e4b\u4e00\u5c31\u662frevert\u547d\u4ee4\u3002revert\u547d\u4ee4\u5141\u8bb8\u4f60\u56de\u6eda\u524d\u4e00\u6b21\u6216\u591a\u6b21\u63d0\u4ea4\uff0c\u4f7f\u672c\u5730\u4ee3\u7801\u5e93\u56de\u5230\u6307\u5b9a\u72b6\u6001\u3002<\/p>\n<p>\u672c\u6587\u5c06\u5411\u4f60\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528Git\u7684revert\u547d\u4ee4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\uff0c\u4ee5\u53ca\u5e38\u89c1\u7684\u95ee\u9898\u89e3\u51b3\u65b9\u6cd5\u3002<\/p>\n<p>\u4e00\u3001\u4e0d\u540c\u7c7b\u578b\u7684\u64a4\u9500\u64cd\u4f5c<\/p>\n<p>Git\u4e2d\u6709\u4e24\u4e2a\u4e3b\u8981\u7684\u7248\u672c\u56de\u6eda\u64cd\u4f5c\uff1areset\u548crevert\u3002<\/p>\n<p>reset\u64cd\u4f5c\u7528\u4e8e\u64a4\u9500\u672c\u5730\u63d0\u4ea4\uff0c\u5e76\u5c06HEAD\u6307\u9488\u6307\u5411\u6240\u9700\u7684\u63d0\u4ea4\u7248\u672c\uff08Hard Reset\uff09\uff0c\u6216\u5c06HEAD\u6307\u9488\u79fb\u52a8\u5230\u6240\u9700\u7248\u672c\u7684\u8def\u5f84\uff08Soft Reset\uff09\u3002<\/p>\n<p>\u800crevert\u547d\u4ee4\u7528\u4e8e\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002\u8fd9\u79cd\u65b9\u6cd5\u5bf9\u4e8e\u64a4\u9500\u5df2\u7ecf\u88ab\u5408\u5e76\u5230\u5176\u4ed6\u5206\u652f\u7684\u63d0\u4ea4\u7279\u522b\u6709\u7528\u3002<\/p>\n<p>\u4e8c\u3001\u4f7f\u7528revert\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4<\/p>\n<p>\u901a\u8fc7\u4f7f\u7528revert\u547d\u4ee4\uff0c\u53ef\u4ee5\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002<\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u7528\u5982\u4e0b\u7684\u8bed\u6cd5\uff1a<\/p>\n<pre>$ git revert commit_id<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d\uff0ccommit_id\u662f\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u7684ID\u3002\u5b83\u5fc5\u987b\u662f\u4e00\u4e2a\u51c6\u786e\u7684\u503c\uff08\u53ef\u4ee5\u5728git log\u547d\u4ee4\u4e2d\u627e\u5230\uff09\u3002<\/p>\n<p>\u8be5\u547d\u4ee4\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u64a4\u9500\u6307\u5b9a\u7684\u63d0\u4ea4\u6240\u5e26\u6765\u7684\u66f4\u6539\uff0c\u5e76\u5c06\u65b0\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e0a\uff0c\u4ee5\u4fbf\u5176\u4ed6\u4eba\u4e86\u89e3\u5728\u4f55\u5904\u8fdb\u884c\u4e86\u64a4\u9500\u3002<\/p>\n<p>\u6bd4\u5982\uff0c\u5982\u679c\u6211\u4eec\u5411\u4e00\u4e2a\u6587\u4ef6\u6dfb\u52a0\u4e86\u4e00\u884c\u5185\u5bb9\u5e76\u63d0\u4ea4\u4e86\u66f4\u6539\u540e\u60f3\u8981\u64a4\u9500\u8fd9\u4e2a\u66f4\u6539\uff0c\u53ef\u4ee5\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n<pre>$ git revert a1b2c3d4<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4f1a\u64a4\u9500ID\u4e3aa1b2c3d4\u7684\u63d0\u4ea4\uff0c\u5e76\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002<\/p>\n<p>\u4e09\u3001revert\u547d\u4ee4\u7684\u5e38\u89c1\u95ee\u9898\u53ca\u89e3\u51b3\u65b9\u6cd5<\/p>\n<p>\u5728\u4f7f\u7528revert\u547d\u4ee4\u65f6\uff0c\u6709\u4e00\u4e9b\u5e38\u89c1\u7684\u95ee\u9898\u9700\u8981\u6ce8\u610f\u3002<\/p>\n<ol>\n<li>\u5408\u5e76\u51b2\u7a81<\/li>\n<\/ol>\n<p>\u5982\u679crevert\u547d\u4ee4\u9047\u5230\u5408\u5e76\u51b2\u7a81\uff0cGit\u4f1a\u63d0\u793a\u4f60\u8fdb\u884c\u624b\u52a8\u5408\u5e76\u3002\u5982\u679c\u4f60\u9700\u8981\u624b\u52a8\u5408\u5e76\uff0c\u53ef\u4ee5\u4f7f\u7528git merge\u6765\u5b8c\u6210\u3002<\/p>\n<ol>\n<li>\u6062\u590d\u6587\u4ef6\u7684\u90e8\u5206\u66f4\u6539<\/li>\n<\/ol>\n<p>\u5982\u679c\u8981\u4ece\u63d0\u4ea4\u4e2d\u64a4\u9500\u90e8\u5206\u66f4\u6539\uff08\u800c\u4e0d\u662f\u6574\u4e2a\u63d0\u4ea4\uff09\uff0c\u5219\u9700\u8981\u4f7f\u7528git add\u548cgit commit\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u4e34\u65f6\u63d0\u4ea4\u3002\u4e3a\u6b64\uff0c\u8bf7\u5148\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u5c06\u5176\u79fb\u52a8\u5230\u8981\u6062\u590d\u7684\u63d0\u4ea4\u7684\u4f4d\u7f6e\uff1a<\/p>\n<pre>$ git checkout -b temp_branch commit_id<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u7136\u540e\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u66f4\u6539\uff1a<\/p>\n<pre>$ git diff HEAD^ HEAD<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4ec5\u8fd8\u539f\u6307\u5b9a\u7684\u66f4\u6539\uff1a<\/p>\n<pre>$ git checkout HEAD^ -- path\/to\/file\n$ git checkout -p HEAD@{1} path\/to\/file<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6700\u540e\uff0c\u4f7f\u7528git add\u548cgit commit\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u5e76\u5c06\u5176\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e2d\uff1a<\/p>\n<pre>$ git checkout origin\/destination\n$ git merge temp_branch<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<ol>\n<li>\u540e\u6094<\/li>\n<\/ol>\n<p>\u5982\u679c\u4e0d\u5c0f\u5fc3\u4f7f\u7528\u4e86revert\u547d\u4ee4\u6765\u64a4\u9500\u4e86\u9519\u8bef\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528git reflog\u547d\u4ee4\u67e5\u627e\u4e4b\u524d\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u4f7f\u7528git reset\u547d\u4ee4\u6765\u56de\u6eda\u751a\u81f3\u5b8c\u5168\u64a4\u9500\u66f4\u6539\u3002<\/p>\n<pre>$ git reflog\n$ git reset HEAD@{1}<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6216\u8005\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u56de\u6eda\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\uff1a<\/p>\n<pre>$ git reset --hard HEAD^<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5728\u672c\u6587\u4e2d\uff0c\u6211\u4eec\u4ecb\u7ecd\u4e86\u5982\u4f55\u4f7f\u7528Git\u7684revert\u547d\u4ee4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u5e76\u8fd8\u539f\u66f4\u6539\uff0c\u4ee5\u53ca\u4e00\u4e9b\u5e38\u89c1\u7684\u95ee\u9898\u53ca\u5176\u89e3\u51b3\u65b9\u6cd5\u3002\u8fd9\u4e9b\u64cd\u4f5c\u53ef\u4ee5\u5e2e\u52a9\u4f60\u66f4\u597d\u5730\u7ba1\u7406\u4f60\u7684\u4ee3\u7801\u5e93\uff0c\u4ece\u800c\u63d0\u9ad8\u4f60\u7684\u5de5\u4f5c\u6548\u7387\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u4f7f\u7528Git revert\u547d\u4ee4\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\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>\u5728\u4f7f\u7528git\u8fdb\u884c\u4ee3\u7801\u7248\u672c\u63a7\u5236\u65f6\uff0c\u4e0d\u53ef\u907f\u514d\u5730\u4f1a\u51fa\u73b0\u9700\u8981\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u7684\u60c5\u51b5\u3002git\u63d0\u4f9b\u4e86\u591a\u79cd\u65b9\u5f0f\u6765\u64a4\u9500\u5df2\u7ecf\u63d0\u4ea4\u7684\u4ee3\u7801\u66f4\u6539\uff0c\u5176\u4e2d\u4e4b\u4e00\u5c31\u662frevert\u547d\u4ee4\u3002revert\u547d\u4ee4\u5141\u8bb8\u4f60\u56de\u6eda\u524d\u4e00\u6b21\u6216\u591a\u6b21\u63d0\u4ea4\uff0c\u4f7f\u672c\u5730\u4ee3\u7801\u5e93\u56de\u5230\u6307\u5b9a\u72b6\u6001\u3002 \u672c\u6587\u5c06\u5411\u4f60\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528Git\u7684revert\u547d\u4ee4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\uff0c\u4ee5\u53ca\u5e38\u89c1\u7684\u95ee\u9898\u89e3\u51b3\u65b9\u6cd5\u3002 \u4e00\u3001\u4e0d\u540c\u7c7b\u578b\u7684\u64a4\u9500\u64cd\u4f5c Git\u4e2d\u6709\u4e24\u4e2a\u4e3b\u8981\u7684\u7248\u672c\u56de\u6eda\u64cd\u4f5c\uff1areset\u548crevert\u3002 reset\u64cd\u4f5c\u7528\u4e8e\u64a4\u9500\u672c\u5730\u63d0\u4ea4\uff0c\u5e76\u5c06HEAD\u6307\u9488\u6307\u5411\u6240\u9700\u7684\u63d0\u4ea4\u7248\u672c\uff08Hard Reset\uff09\uff0c\u6216\u5c06HEAD\u6307\u9488\u79fb\u52a8\u5230\u6240\u9700\u7248\u672c\u7684\u8def\u5f84\uff08Soft Reset\uff09\u3002 \u800crevert\u547d\u4ee4\u7528\u4e8e\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002\u8fd9\u79cd\u65b9\u6cd5\u5bf9\u4e8e\u64a4\u9500\u5df2\u7ecf\u88ab\u5408\u5e76\u5230\u5176\u4ed6\u5206\u652f\u7684\u63d0\u4ea4\u7279\u522b\u6709\u7528\u3002 \u4e8c\u3001\u4f7f\u7528revert\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4 \u901a\u8fc7\u4f7f\u7528revert\u547d\u4ee4\uff0c\u53ef\u4ee5\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002 \u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u7528\u5982\u4e0b\u7684\u8bed\u6cd5\uff1a $ git revert commit_id \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0ccommit_id\u662f\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u7684ID\u3002\u5b83\u5fc5\u987b\u662f\u4e00\u4e2a\u51c6\u786e\u7684\u503c\uff08\u53ef\u4ee5\u5728git log\u547d\u4ee4\u4e2d\u627e\u5230\uff09\u3002 \u8be5\u547d\u4ee4\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u64a4\u9500\u6307\u5b9a\u7684\u63d0\u4ea4\u6240\u5e26\u6765\u7684\u66f4\u6539\uff0c\u5e76\u5c06\u65b0\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e0a\uff0c\u4ee5\u4fbf\u5176\u4ed6\u4eba\u4e86\u89e3\u5728\u4f55\u5904\u8fdb\u884c\u4e86\u64a4\u9500\u3002 \u6bd4\u5982\uff0c\u5982\u679c\u6211\u4eec\u5411\u4e00\u4e2a\u6587\u4ef6\u6dfb\u52a0\u4e86\u4e00\u884c\u5185\u5bb9\u5e76\u63d0\u4ea4\u4e86\u66f4\u6539\u540e\u60f3\u8981\u64a4\u9500\u8fd9\u4e2a\u66f4\u6539\uff0c\u53ef\u4ee5\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git revert a1b2c3d4 \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4f1a\u64a4\u9500ID\u4e3aa1b2c3d4\u7684\u63d0\u4ea4\uff0c\u5e76\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u8fd8\u539f\u66f4\u6539\u3002 \u4e09\u3001revert\u547d\u4ee4\u7684\u5e38\u89c1\u95ee\u9898\u53ca\u89e3\u51b3\u65b9\u6cd5 \u5728\u4f7f\u7528revert\u547d\u4ee4\u65f6\uff0c\u6709\u4e00\u4e9b\u5e38\u89c1\u7684\u95ee\u9898\u9700\u8981\u6ce8\u610f\u3002 \u5408\u5e76\u51b2\u7a81 \u5982\u679crevert\u547d\u4ee4\u9047\u5230\u5408\u5e76\u51b2\u7a81\uff0cGit\u4f1a\u63d0\u793a\u4f60\u8fdb\u884c\u624b\u52a8\u5408\u5e76\u3002\u5982\u679c\u4f60\u9700\u8981\u624b\u52a8\u5408\u5e76\uff0c\u53ef\u4ee5\u4f7f\u7528git merge\u6765\u5b8c\u6210\u3002 \u6062\u590d\u6587\u4ef6\u7684\u90e8\u5206\u66f4\u6539 \u5982\u679c\u8981\u4ece\u63d0\u4ea4\u4e2d\u64a4\u9500\u90e8\u5206\u66f4\u6539\uff08\u800c\u4e0d\u662f\u6574\u4e2a\u63d0\u4ea4\uff09\uff0c\u5219\u9700\u8981\u4f7f\u7528git add\u548cgit commit\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u4e34\u65f6\u63d0\u4ea4\u3002\u4e3a\u6b64\uff0c\u8bf7\u5148\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u5c06\u5176\u79fb\u52a8\u5230\u8981\u6062\u590d\u7684\u63d0\u4ea4\u7684\u4f4d\u7f6e\uff1a $ git checkout -b temp_branch commit_id \u767b\u5f55\u540e\u590d\u5236 \u7136\u540e\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u66f4\u6539\uff1a $ git diff HEAD^ HEAD \u767b\u5f55\u540e\u590d\u5236 \u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4ec5\u8fd8\u539f\u6307\u5b9a\u7684\u66f4\u6539\uff1a $ git checkout HEAD^ &#8212; [&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-19252","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19252","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=19252"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19252\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19252"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19252"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19252"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}