{"id":20353,"date":"2024-11-19T15:18:09","date_gmt":"2024-11-19T07:18:09","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20353\/"},"modified":"2024-11-19T15:18:09","modified_gmt":"2024-11-19T07:18:09","slug":"%e6%8f%90%e4%ba%a4%e5%88%b0git%e7%9a%84%e6%80%8e%e4%b9%88%e5%88%a0%e9%99%a4","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20353\/","title":{"rendered":"\u63d0\u4ea4\u5230git\u7684\u600e\u4e48\u5220\u9664"},"content":{"rendered":"

git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u88ab\u5e7f\u6cdb\u7528\u4e8e\u8f6f\u4ef6\u5f00\u53d1\u9879\u76ee\u4e2d\u3002\u5728\u4f7f\u7528git\u65f6\uff0c\u7ecf\u5e38\u4f1a\u6d89\u53ca\u5230\u63d0\u4ea4\u3001\u5408\u5e76\u548c\u5220\u9664\u7b49\u64cd\u4f5c\u3002\u672c\u6587\u5c06\u91cd\u70b9\u4ecb\u7ecd\u5982\u4f55\u5220\u9664\u63d0\u4ea4\u5230git\u4e0a\u7684\u5185\u5bb9\u3002<\/p>\n

\u5728Git\u4e2d\uff0c\u63d0\u4ea4\u662f\u4e00\u79cd\u91cd\u8981\u7684\u64cd\u4f5c\uff0c\u5b83\u53ef\u4ee5\u5c06\u5f53\u524d\u7684\u4ee3\u7801\u5e93\u72b6\u6001\u4fdd\u5b58\u5230\u4e00\u4e2a\u4ee3\u7801\u4ed3\u5e93\u4e2d\u3002\u63d0\u4ea4\u4e4b\u540e\uff0c\u53ef\u4ee5\u5728\u4ee3\u7801\u4ed3\u5e93\u7684\u5386\u53f2\u8bb0\u5f55\u4e2d\u67e5\u770b\u5230\u8be5\u63d0\u4ea4\u7684\u8be6\u7ec6\u4fe1\u606f\u3002\u4f46\u662f\uff0c\u5f53\u6211\u4eec\u5728\u63d0\u4ea4\u7684\u8fc7\u7a0b\u4e2d\u53d1\u73b0\u6709\u9519\u8bef\u6216\u8005\u9700\u8981\u4fee\u6539\u65f6\uff0c\u5c31\u9700\u8981\u5220\u9664\u5df2\u7ecf\u63d0\u4ea4\u7684\u5185\u5bb9\u3002<\/p>\n

Git\u63d0\u4f9b\u4e86\u51e0\u79cd\u5220\u9664\u63d0\u4ea4\u7684\u65b9\u6cd5\uff1a<\/p>\n

    \n
  1. \u4f7f\u7528Git reset\u547d\u4ee4<\/li>\n<\/ol>\n

    \u4f7f\u7528git reset\u547d\u4ee4\u53ef\u4ee5\u64a4\u9500\u4e00\u6b21\u63d0\u4ea4\uff0c\u8fd9\u6837\u53ef\u4ee5\u4f7f\u5f97\u4ee3\u7801\u5e93\u56de\u5230\u63d0\u4ea4\u524d\u7684\u72b6\u6001\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a<\/p>\n

    $ git reset [--soft | --mixed | --hard] \u63d0\u4ea4\u54c8\u5e0c\u503c<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5176\u4e2d\uff0c–soft\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u4f46\u4e0d\u5220\u9664\u4efb\u4f55\u6587\u4ef6\u6216\u4fee\u6539\uff1b–mixed\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u5e76\u53d6\u6d88\u6682\u5b58\uff0c\u4f46\u4e0d\u5220\u9664\u4efb\u4f55\u6587\u4ef6\u6216\u4fee\u6539\uff1b–hard\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u5e76\u5220\u9664\u6240\u6709\u66f4\u6539\u5185\u5bb9\u3002<\/p>\n
    \u4f8b\u5982\uff0c\u5982\u679c\u8981\u5220\u9664\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u5e76\u5c06\u4ee3\u7801\u5e93\u56de\u6eda\u5230\u8be5\u63d0\u4ea4\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
    $ git reset HEAD~1 --hard<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5176\u4e2d\uff0cHEAD~1\u8868\u793a\u56de\u5230\u524d\u4e00\u6b21\u63d0\u4ea4\uff0c–hard\u9009\u9879\u8868\u793a\u5c06\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u66f4\u6539\u90fd\u6062\u590d\u5230\u8be5\u63d0\u4ea4\u7684\u72b6\u6001\u3002<\/p>\n
      \n
    1. \u4f7f\u7528Git revert\u547d\u4ee4<\/li>\n<\/ol>\n
      \u4f7f\u7528git revert\u547d\u4ee4\u53ef\u4ee5\u64a4\u9500\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4ea4\uff0c\u5e76\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u4ee3\u8868\u8fd9\u79cd\u64a4\u9500\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a<\/p>\n
      $ git revert [\u63d0\u4ea4\u54c8\u5e0c\u503c]<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u4f8b\u5982\uff0c\u5982\u679c\u8981\u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u5e76\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u4ee3\u8868\u8fd9\u79cd\u64a4\u9500\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
      $ git revert HEAD<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8be5\u547d\u4ee4\u5c06\u5728\u5f53\u524d\u5206\u652f\u4e0a\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u4ee5\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u3002<\/p>\n
        \n
      1. \u4f7f\u7528Git rebase\u547d\u4ee4<\/li>\n<\/ol>\n
        \u4f7f\u7528git rebase\u547d\u4ee4\u53ef\u4ee5\u5220\u9664\u63d0\u4ea4\uff0c\u5e76\u5c06\u66f4\u6539\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u63d0\u4ea4\u4e2d\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a<\/p>\n
        $ git rebase -i [\u63d0\u4ea4\u54c8\u5e0c\u503c]<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u4f8b\u5982\uff0c\u5982\u679c\u8981\u5c06\u524d\u4e24\u4e2a\u63d0\u4ea4\u5408\u5e76\u5230\u4e00\u4e2a\u63d0\u4ea4\u4e2d\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
        $ git rebase -i HEAD~2<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u8be5\u547d\u4ee4\u5c06\u6253\u5f00\u4ea4\u4e92\u5f0f\u7f16\u8f91\u5668\uff0c\u8ba9\u60a8\u9009\u62e9\u8981\u5220\u9664\u7684\u63d0\u4ea4\u3002\u5728\u7f16\u8f91\u5668\u4e2d\uff0c\u5c06\u6bcf\u4e2a\u8981\u5220\u9664\u7684\u63d0\u4ea4\u524d\u9762\u7684\u5355\u8bcd”pick”\u66ff\u6362\u4e3a”delete”\uff0c\u7136\u540e\u4fdd\u5b58\u5e76\u5173\u95ed\u7f16\u8f91\u5668\u3002\u8fd9\u5c06\u5220\u9664\u6240\u9009\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u5b83\u4eec\u5408\u5e76\u5230\u4e0b\u4e00\u4e2a\u63d0\u4ea4\u4e2d\u3002<\/p>\n
        \u603b\u7ed3\uff1a<\/p>\n
        \u4ee5\u4e0a\u662f\u4e09\u79cd\u5220\u9664\u63d0\u4ea4\u7684\u65b9\u6cd5\uff0c\u6bcf\u4e2a\u65b9\u6cd5\u90fd\u6709\u81ea\u5df1\u7684\u5e94\u7528\u573a\u666f\u3002\u5728\u5b9e\u9645\u5e94\u7528\u4e2d\uff0c\u53ef\u4ee5\u6839\u636e\u5177\u4f53\u60c5\u51b5\u9009\u62e9\u6700\u5408\u9002\u7684\u65b9\u6cd5\u6765\u5220\u9664\u63d0\u4ea4\u3002\u91cd\u8981\u7684\u662f\uff0c\u5220\u9664\u63d0\u4ea4\u524d\u4e00\u5b9a\u8981\u8c28\u614e\uff0c\u786e\u4fdd\u4e0d\u4f1a\u5220\u9664\u4efb\u4f55\u91cd\u8981\u7684\u6587\u4ef6\u6216\u4fee\u6539\u3002<\/p>\n
        \u4ee5\u4e0a\u5c31\u662f\u63d0\u4ea4\u5230git\u7684\u600e\u4e48\u5220\u9664\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\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u88ab\u5e7f\u6cdb\u7528\u4e8e\u8f6f\u4ef6\u5f00\u53d1\u9879\u76ee\u4e2d\u3002\u5728\u4f7f\u7528git\u65f6\uff0c\u7ecf\u5e38\u4f1a\u6d89\u53ca\u5230\u63d0\u4ea4\u3001\u5408\u5e76\u548c\u5220\u9664\u7b49\u64cd\u4f5c\u3002\u672c\u6587\u5c06\u91cd\u70b9\u4ecb\u7ecd\u5982\u4f55\u5220\u9664\u63d0\u4ea4\u5230git\u4e0a\u7684\u5185\u5bb9\u3002 \u5728Git\u4e2d\uff0c\u63d0\u4ea4\u662f\u4e00\u79cd\u91cd\u8981\u7684\u64cd\u4f5c\uff0c\u5b83\u53ef\u4ee5\u5c06\u5f53\u524d\u7684\u4ee3\u7801\u5e93\u72b6\u6001\u4fdd\u5b58\u5230\u4e00\u4e2a\u4ee3\u7801\u4ed3\u5e93\u4e2d\u3002\u63d0\u4ea4\u4e4b\u540e\uff0c\u53ef\u4ee5\u5728\u4ee3\u7801\u4ed3\u5e93\u7684\u5386\u53f2\u8bb0\u5f55\u4e2d\u67e5\u770b\u5230\u8be5\u63d0\u4ea4\u7684\u8be6\u7ec6\u4fe1\u606f\u3002\u4f46\u662f\uff0c\u5f53\u6211\u4eec\u5728\u63d0\u4ea4\u7684\u8fc7\u7a0b\u4e2d\u53d1\u73b0\u6709\u9519\u8bef\u6216\u8005\u9700\u8981\u4fee\u6539\u65f6\uff0c\u5c31\u9700\u8981\u5220\u9664\u5df2\u7ecf\u63d0\u4ea4\u7684\u5185\u5bb9\u3002 Git\u63d0\u4f9b\u4e86\u51e0\u79cd\u5220\u9664\u63d0\u4ea4\u7684\u65b9\u6cd5\uff1a \u4f7f\u7528Git reset\u547d\u4ee4 \u4f7f\u7528git reset\u547d\u4ee4\u53ef\u4ee5\u64a4\u9500\u4e00\u6b21\u63d0\u4ea4\uff0c\u8fd9\u6837\u53ef\u4ee5\u4f7f\u5f97\u4ee3\u7801\u5e93\u56de\u5230\u63d0\u4ea4\u524d\u7684\u72b6\u6001\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a $ git reset [–soft | –mixed | –hard] \u63d0\u4ea4\u54c8\u5e0c\u503c \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c–soft\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u4f46\u4e0d\u5220\u9664\u4efb\u4f55\u6587\u4ef6\u6216\u4fee\u6539\uff1b–mixed\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u5e76\u53d6\u6d88\u6682\u5b58\uff0c\u4f46\u4e0d\u5220\u9664\u4efb\u4f55\u6587\u4ef6\u6216\u4fee\u6539\uff1b–hard\u9009\u9879\u8868\u793a\u64a4\u9500\u63d0\u4ea4\u5e76\u5220\u9664\u6240\u6709\u66f4\u6539\u5185\u5bb9\u3002 \u4f8b\u5982\uff0c\u5982\u679c\u8981\u5220\u9664\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u5e76\u5c06\u4ee3\u7801\u5e93\u56de\u6eda\u5230\u8be5\u63d0\u4ea4\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git reset HEAD~1 –hard \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0cHEAD~1\u8868\u793a\u56de\u5230\u524d\u4e00\u6b21\u63d0\u4ea4\uff0c–hard\u9009\u9879\u8868\u793a\u5c06\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u66f4\u6539\u90fd\u6062\u590d\u5230\u8be5\u63d0\u4ea4\u7684\u72b6\u6001\u3002 \u4f7f\u7528Git revert\u547d\u4ee4 \u4f7f\u7528git revert\u547d\u4ee4\u53ef\u4ee5\u64a4\u9500\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4ea4\uff0c\u5e76\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u4ee3\u8868\u8fd9\u79cd\u64a4\u9500\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a $ git revert [\u63d0\u4ea4\u54c8\u5e0c\u503c] \u767b\u5f55\u540e\u590d\u5236 \u4f8b\u5982\uff0c\u5982\u679c\u8981\u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u5e76\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u4ee3\u8868\u8fd9\u79cd\u64a4\u9500\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git revert HEAD \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u5728\u5f53\u524d\u5206\u652f\u4e0a\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u4ee5\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u3002 \u4f7f\u7528Git rebase\u547d\u4ee4 \u4f7f\u7528git rebase\u547d\u4ee4\u53ef\u4ee5\u5220\u9664\u63d0\u4ea4\uff0c\u5e76\u5c06\u66f4\u6539\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u63d0\u4ea4\u4e2d\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a $ git rebase -i [\u63d0\u4ea4\u54c8\u5e0c\u503c] \u767b\u5f55\u540e\u590d\u5236 \u4f8b\u5982\uff0c\u5982\u679c\u8981\u5c06\u524d\u4e24\u4e2a\u63d0\u4ea4\u5408\u5e76\u5230\u4e00\u4e2a\u63d0\u4ea4\u4e2d\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git […]<\/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-20353","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20353","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=20353"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20353\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20353"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20353"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20353"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}