{"id":20366,"date":"2024-11-19T11:52:14","date_gmt":"2024-11-19T03:52:14","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20366\/"},"modified":"2024-11-19T11:52:14","modified_gmt":"2024-11-19T03:52:14","slug":"git%e6%80%8e%e4%b9%88%e5%88%a0%e9%99%a4%e4%bb%a5%e5%89%8d%e7%89%88%e6%9c%ac","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20366\/","title":{"rendered":"git\u600e\u4e48\u5220\u9664\u4ee5\u524d\u7248\u672c"},"content":{"rendered":"

git\u662f\u5f53\u4eca\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\u3002\u5b83\u7684\u5f3a\u5927\u548c\u7075\u6d3b\u6027\u662f\u5f00\u53d1\u4eba\u5458\u548c\u56e2\u961f\u7684\u9996\u9009\uff0cgit\u53ef\u4ee5\u8ddf\u8e2a\u9879\u76ee\u7684\u6240\u6709\u66f4\u6539\u548c\u5386\u53f2\u8bb0\u5f55\u3002\u4f46\u662f\uff0c\u5728\u8fdb\u884c\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u9700\u8981\u5220\u9664\u4e00\u4e9b\u65e7\u7248\u672c\u3002\u8fd9\u7bc7\u6587\u7ae0\u5c06\u544a\u8bc9\u60a8\u5982\u4f55\u5220\u9664\u65e7\u7248\u672c\uff0c\u6e05\u7406\u60a8\u7684git\u5386\u53f2\u8bb0\u5f55\u3002<\/p>\n

    \n
  1. Git Reset<\/li>\n<\/ol>\n

    \u4f7f\u7528Git Reset\u547d\u4ee4\u53ef\u4ee5\u8f7b\u677e\u5220\u9664\u65e7\u7248\u672c\uff0c\u5b83\u4f1a\u5c06HEAD\uff08\u5f53\u524d\u5206\u652f\uff09\u6307\u5411\u60a8\u8981\u5220\u9664\u7684\u65e7\u7248\u672c\u3002\u8bf7\u6ce8\u610f\uff0c\u7531\u4e8eGit Reset\u5b9e\u9645\u4e0a\u662f\u5c06HEAD\u6307\u5411\u65e7\u7248\u672c\uff0c\u56e0\u6b64\u5b83\u4f1a\u4e22\u5931\u8be5\u7248\u672c\u4e4b\u540e\u6240\u505a\u7684\u6240\u6709\u66f4\u6539\u3002<\/p>\n

    \u5c06HEAD\u6307\u5411\u65e7\u7248\u672c\u7684\u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n

    git reset <commit><\/commit><\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5176\u4e2d  \u662f\u60a8\u8981\u5220\u9664\u7684\u65e7\u7248\u672c\u53f7\u3002\u4f8b\u5982\uff0c\u5982\u679c\u8981\u5220\u9664\u6700\u65b0\u7684\u4e24\u4e2a\u63d0\u4ea4\uff0c\u547d\u4ee4\u5982\u4e0b\uff1a <\/p>\n
    git reset HEAD~2<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u8fd9\u5c06\u5c06HEAD\u6307\u5411\u5012\u6570\u7b2c\u4e09\u4e2a\u63d0\u4ea4\u3002<\/p>\n
    \u7b80\u5355\u7684\u547d\u4ee4\u4f1a\u91cd\u7f6eHEAD\uff0c\u4f46\u4e0d\u4f1a\u5220\u9664\u63d0\u4ea4\u3002\u5982\u679c\u60a8\u786e\u5b9e\u60f3\u5220\u9664\u63d0\u4ea4\uff0c\u9700\u8981\u4f7f\u7528”–hard”\u9009\u9879\uff1a<\/p>\n
    git reset --hard <commit><\/commit><\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u8bf7\u8bb0\u4f4f\uff0c\u8fd9\u662f\u4e00\u4e2a\u6ca1\u6709\u8fd4\u56de\u7684\u64cd\u4f5c\u3002\u5982\u679c\u60a8\u5df2\u7ecf\u5207\u6362\u5230\u8fd9\u4e2a\u63d0\u4ea4\u5e76\u4e14\u9700\u8981\u6062\u590d\uff0c\u8bf7\u5efa\u7acb\u5907\u4efd\u3002<\/p>\n
      \n
    1. Git Revert<\/li>\n<\/ol>\n
      \u4f7f\u7528Git Revert\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\uff0c\u5b83\u64a4\u6d88\u4e86\u65e7\u7248\u672c\u6240\u505a\u7684\u66f4\u6539\u3002\u8fd9\u662f\u4e00\u4e2a\u66f4\u5b89\u5168\u7684\u65b9\u6cd5\uff0c\u56e0\u4e3a\u5b83\u4e0d\u4f1a\u5220\u9664\u63d0\u4ea4\uff0c\u800c\u662f\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u64a4\u6d88\u65e7\u7248\u672c\u7684\u66f4\u6539\u3002<\/p>\n
      \u64a4\u9500\u63d0\u4ea4\u7684\u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n
      git revert <commit><\/commit><\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u5176\u4e2d  \u662f\u60a8\u8981\u64a4\u9500\u7684\u65e7\u7248\u672c\u53f7\u3002\u4f8b\u5982\uff0c\u8981\u64a4\u9500\u6700\u65b0\u7684\u4e24\u4e2a\u63d0\u4ea4\uff0c\u8bf7\u952e\u5165\u4ee5\u4e0b\u5185\u5bb9\uff1a <\/p>\n
      git revert HEAD~2..HEAD<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8fd9\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\uff0c\u64a4\u6d88\u6240\u6709\u4ece\u5012\u6570\u7b2c\u4e09\u4e2a\u63d0\u4ea4\u5230\u6700\u65b0\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\u3002<\/p>\n
        \n
      1. Git Rebase<\/li>\n<\/ol>\n
        \u4ee5\u4e0a\u4e24\u79cd\u65b9\u5f0f\u90fd\u662f\u66f4\u6539\u5386\u53f2\u8bb0\u5f55\u7684\u4e00\u79cd\u65b9\u5f0f\u3002\u5982\u679c\u60a8\u5728\u5171\u4eab\u5206\u652f\u4e2d\u4f7f\u7528Git Reset\u6216Git Revert\uff0c\u53ef\u80fd\u4f1a\u5bfc\u81f4\u5176\u4ed6\u4eba\u7684\u5386\u53f2\u9519\u8bef\u3002\u8fd9\u5c31\u662fGit Rebasing\u7684\u7528\u6b66\u4e4b\u5730\u3002<\/p>\n
        Git Rebase\u662f\u4e00\u79cd\u6574\u7406\u63d0\u4ea4\u4ee5\u5f62\u6210\u65b0\u7684\u5386\u53f2\u8bb0\u5f55\u7684\u65b9\u6cd5\u3002\u901a\u8fc7\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u63d0\u4ea4\u6574\u5408\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u63d0\u4ea4\u4e2d\uff0c\u60a8\u53ef\u4ee5\u6e05\u7406\u5206\u652f\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u5220\u9664\u65e7\u7248\u672c\u3002<\/p>\n
        \u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n
        git rebase -i <commit><\/commit><\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5176\u4e2d-i\u6807\u5fd7\u6253\u5f00\u4e00\u4e2a\u4ea4\u4e92\u5f0f\u91cd\u6392\uff0c\u60a8\u53ef\u4ee5\u5728\u5176\u4e2d\u9009\u62e9\u8981\u5220\u9664\u7684\u63d0\u4ea4\u3002\u4f8b\u5982\uff0c\u8981\u5220\u9664\u6700\u65b0\u7684\u4e24\u4e2a\u63d0\u4ea4\uff0c\u8bf7\u952e\u5165\uff1a<\/p>\n
        git rebase -i HEAD~2<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u7136\u540e\u5c06\u7f16\u8f91\u5668\u4e2d\u7684\u63d0\u4ea4\u5217\u8868\u66f4\u6539\u4e3a\uff1a<\/p>\n
        pick abcdefg commit message\nd eeeeee commit message\nd fffffff commit message<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5c06\u524d\u4e24\u9879\u8bbe\u7f6e\u4e3a”Pick”\uff0c\u5c06\u5176\u4ed6\u4e24\u9879\u8bbe\u7f6e\u4e3a”d”\uff08\u5220\u9664\uff09\u3002\u4fdd\u5b58\u5e76\u5173\u95ed\u7f16\u8f91\u5668\uff0cGit\u5c06\u91cd\u65b0\u6253\u9020\u4e00\u4e2a\u65b0\u7684\u5386\u53f2\u8bb0\u5f55\u3002<\/p>\n
        \u603b\u7ed3<\/p>\n
        \u4ee5\u4e0a\u662f\u4f7f\u7528Git\u5220\u9664\u65e7\u7248\u672c\u7684\u4e09\u79cd\u65b9\u6cd5\u3002\u6bcf\u79cd\u65b9\u6cd5\u90fd\u9002\u7528\u4e8e\u4e0d\u540c\u7684\u573a\u666f\uff0c\u5e76\u4e14\u90fd\u6709\u81ea\u5df1\u7684\u4f18\u7f3a\u70b9\u3002\u8bf7\u6839\u636e\u60a8\u7684\u5177\u4f53\u60c5\u51b5\u9009\u62e9\u6700\u9002\u5408\u60a8\u7684\u65b9\u6cd5\u3002\u65e0\u8bba\u60a8\u9009\u62e9\u54ea\u79cd\u65b9\u5f0f\uff0c\u59cb\u7ec8\u8bb0\u5f97\u5728\u5220\u9664\u63d0\u4ea4\u4e4b\u524d\u8fdb\u884c\u5907\u4efd\uff0c\u4ee5\u4fbf\u5728\u9700\u8981\u6062\u590d\u65f6\u53ef\u4ee5\u6062\u590d\u60a8\u7684\u4ee3\u7801\u3002<\/p>\n
        \u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u5220\u9664\u4ee5\u524d\u7248\u672c\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":"
        git\u662f\u5f53\u4eca\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\u3002\u5b83\u7684\u5f3a\u5927\u548c\u7075\u6d3b\u6027\u662f\u5f00\u53d1\u4eba\u5458\u548c\u56e2\u961f\u7684\u9996\u9009\uff0cgit\u53ef\u4ee5\u8ddf\u8e2a\u9879\u76ee\u7684\u6240\u6709\u66f4\u6539\u548c\u5386\u53f2\u8bb0\u5f55\u3002\u4f46\u662f\uff0c\u5728\u8fdb\u884c\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u9700\u8981\u5220\u9664\u4e00\u4e9b\u65e7\u7248\u672c\u3002\u8fd9\u7bc7\u6587\u7ae0\u5c06\u544a\u8bc9\u60a8\u5982\u4f55\u5220\u9664\u65e7\u7248\u672c\uff0c\u6e05\u7406\u60a8\u7684git\u5386\u53f2\u8bb0\u5f55\u3002 Git Reset \u4f7f\u7528Git Reset\u547d\u4ee4\u53ef\u4ee5\u8f7b\u677e\u5220\u9664\u65e7\u7248\u672c\uff0c\u5b83\u4f1a\u5c06HEAD\uff08\u5f53\u524d\u5206\u652f\uff09\u6307\u5411\u60a8\u8981\u5220\u9664\u7684\u65e7\u7248\u672c\u3002\u8bf7\u6ce8\u610f\uff0c\u7531\u4e8eGit Reset\u5b9e\u9645\u4e0a\u662f\u5c06HEAD\u6307\u5411\u65e7\u7248\u672c\uff0c\u56e0\u6b64\u5b83\u4f1a\u4e22\u5931\u8be5\u7248\u672c\u4e4b\u540e\u6240\u505a\u7684\u6240\u6709\u66f4\u6539\u3002 \u5c06HEAD\u6307\u5411\u65e7\u7248\u672c\u7684\u547d\u4ee4\u5982\u4e0b\uff1a git reset <commit><\/commit> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u60a8\u8981\u5220\u9664\u7684\u65e7\u7248\u672c\u53f7\u3002\u4f8b\u5982\uff0c\u5982\u679c\u8981\u5220\u9664\u6700\u65b0\u7684\u4e24\u4e2a\u63d0\u4ea4\uff0c\u547d\u4ee4\u5982\u4e0b\uff1a git reset HEAD~2 \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u5c06HEAD\u6307\u5411\u5012\u6570\u7b2c\u4e09\u4e2a\u63d0\u4ea4\u3002 \u7b80\u5355\u7684\u547d\u4ee4\u4f1a\u91cd\u7f6eHEAD\uff0c\u4f46\u4e0d\u4f1a\u5220\u9664\u63d0\u4ea4\u3002\u5982\u679c\u60a8\u786e\u5b9e\u60f3\u5220\u9664\u63d0\u4ea4\uff0c\u9700\u8981\u4f7f\u7528”–hard”\u9009\u9879\uff1a git reset –hard <commit><\/commit> \u767b\u5f55\u540e\u590d\u5236 \u8bf7\u8bb0\u4f4f\uff0c\u8fd9\u662f\u4e00\u4e2a\u6ca1\u6709\u8fd4\u56de\u7684\u64cd\u4f5c\u3002\u5982\u679c\u60a8\u5df2\u7ecf\u5207\u6362\u5230\u8fd9\u4e2a\u63d0\u4ea4\u5e76\u4e14\u9700\u8981\u6062\u590d\uff0c\u8bf7\u5efa\u7acb\u5907\u4efd\u3002 Git Revert \u4f7f\u7528Git Revert\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\uff0c\u5b83\u64a4\u6d88\u4e86\u65e7\u7248\u672c\u6240\u505a\u7684\u66f4\u6539\u3002\u8fd9\u662f\u4e00\u4e2a\u66f4\u5b89\u5168\u7684\u65b9\u6cd5\uff0c\u56e0\u4e3a\u5b83\u4e0d\u4f1a\u5220\u9664\u63d0\u4ea4\uff0c\u800c\u662f\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u64a4\u6d88\u65e7\u7248\u672c\u7684\u66f4\u6539\u3002 \u64a4\u9500\u63d0\u4ea4\u7684\u547d\u4ee4\u5982\u4e0b\uff1a git revert <commit><\/commit> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u60a8\u8981\u64a4\u9500\u7684\u65e7\u7248\u672c\u53f7\u3002\u4f8b\u5982\uff0c\u8981\u64a4\u9500\u6700\u65b0\u7684\u4e24\u4e2a\u63d0\u4ea4\uff0c\u8bf7\u952e\u5165\u4ee5\u4e0b\u5185\u5bb9\uff1a git revert HEAD~2..HEAD \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\uff0c\u64a4\u6d88\u6240\u6709\u4ece\u5012\u6570\u7b2c\u4e09\u4e2a\u63d0\u4ea4\u5230\u6700\u65b0\u63d0\u4ea4\u4e4b\u95f4\u7684\u66f4\u6539\u3002 Git Rebase \u4ee5\u4e0a\u4e24\u79cd\u65b9\u5f0f\u90fd\u662f\u66f4\u6539\u5386\u53f2\u8bb0\u5f55\u7684\u4e00\u79cd\u65b9\u5f0f\u3002\u5982\u679c\u60a8\u5728\u5171\u4eab\u5206\u652f\u4e2d\u4f7f\u7528Git Reset\u6216Git Revert\uff0c\u53ef\u80fd\u4f1a\u5bfc\u81f4\u5176\u4ed6\u4eba\u7684\u5386\u53f2\u9519\u8bef\u3002\u8fd9\u5c31\u662fGit Rebasing\u7684\u7528\u6b66\u4e4b\u5730\u3002 Git Rebase\u662f\u4e00\u79cd\u6574\u7406\u63d0\u4ea4\u4ee5\u5f62\u6210\u65b0\u7684\u5386\u53f2\u8bb0\u5f55\u7684\u65b9\u6cd5\u3002\u901a\u8fc7\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u63d0\u4ea4\u6574\u5408\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u63d0\u4ea4\u4e2d\uff0c\u60a8\u53ef\u4ee5\u6e05\u7406\u5206\u652f\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u5220\u9664\u65e7\u7248\u672c\u3002 \u547d\u4ee4\u5982\u4e0b\uff1a git rebase -i <commit><\/commit> \u767b\u5f55\u540e\u590d\u5236 […]<\/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-20366","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20366","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=20366"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20366\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20366"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20366"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20366"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}