{"id":19080,"date":"2024-11-19T15:51:35","date_gmt":"2024-11-19T07:51:35","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19080\/"},"modified":"2024-11-19T15:51:35","modified_gmt":"2024-11-19T07:51:35","slug":"git-%e6%80%8e%e4%b9%88%e5%9b%9e%e9%80%80%e7%89%88%e6%9c%ac","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19080\/","title":{"rendered":"git \u600e\u4e48\u56de\u9000\u7248\u672c"},"content":{"rendered":"<p>\u4f5c\u4e3a\u7248\u672c\u63a7\u5236\u5de5\u5177\u7684 git\uff0c\u6700\u57fa\u672c\u7684\u529f\u80fd\u5c31\u662f\u8bb0\u5f55\u9879\u76ee\u7684\u5386\u53f2\u4fee\u6539\u4fe1\u606f\uff0c\u4ee5\u4fbf\u4e8e\u5f00\u53d1\u4eba\u5458\u4e86\u89e3\u9879\u76ee\u7684\u6f14\u53d8\u8fc7\u7a0b\uff0c\u5e76\u4e14\u63d0\u4f9b\u4e86\u4e00\u4e9b\u65b9\u4fbf\u7684\u64cd\u4f5c\u5de5\u5177\uff0c\u6bd4\u5982\u56de\u9000\u64cd\u4f5c\uff0c\u4ee5\u4fbf\u4e8e\u5f00\u53d1\u4eba\u5458\u5728\u9879\u76ee\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u66f4\u8f7b\u677e\u5730\u7ba1\u7406\u4ee3\u7801\u53d8\u66f4\u3002<\/p>\n<p>Git \u53ef\u4ee5\u56de\u9000\u7248\u672c\uff0c\u8fd9\u5bf9\u5f00\u53d1\u4eba\u5458\u6765\u8bf4\u975e\u5e38\u6709\u7528\uff0c\u56e0\u4e3a\u4ed6\u4eec\u53ef\u4ee5\u56de\u5230\u4ee5\u524d\u7684\u7248\u672c\uff0c\u67e5\u770b\u4ee3\u7801\u5e76\u8fdb\u884c\u4fee\u6539\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528 Git \u56de\u9000\u7248\u672c\u3002<\/p>\n<p>\u4e00\u3001\u67e5\u770b Git \u4e2d\u5f53\u524d\u7684\u7248\u672c\u4fe1\u606f<\/p>\n<p>\u5728\u56de\u9000\u7248\u672c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u5148\u67e5\u51fa\u5f53\u524d\u7248\u672c\u3002\u4f7f\u7528 Git \u63d0\u4f9b\u7684git log\u547d\u4ee4\uff0c\u53ef\u4ee5\u67e5\u770b\u5f53\u524d\u5206\u652f\u7684\u6240\u6709\u63d0\u4ea4\u5386\u53f2\uff0c\u4ee5\u53ca\u63d0\u4ea4\u65f6\u7684\u8be6\u7ec6\u4fe1\u606f\u3002<\/p>\n<p>\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n<p> git log <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u663e\u793a\u6240\u6709\u63d0\u4ea4\u7684 SHA-1 \u6821\u9a8c\u548c\u3001\u4f5c\u8005\u540d\u79f0\u3001\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3001\u63d0\u4ea4\u65e5\u671f\u548c\u63d0\u4ea4\u8bf4\u660e\u7b49\u8be6\u7ec6\u4fe1\u606f\u3002<\/p>\n<p>\u5982\u679c\u5728\u663e\u793a\u6240\u6709\u5386\u53f2\u8bb0\u5f55\u65f6\uff0c\u5c4f\u5e55\u4fe1\u606f\u8fc7\u591a\u65e0\u6cd5\u770b\u5b8c\uff0c\u53ef\u4ee5\u6309q\u952e\u9000\u51fa\u3002<\/p>\n<p>\u4e8c\u3001\u56de\u9000\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u7248\u672c<\/p>\n<p>\u5728 Git \u4e2d\u56de\u9000\u5230\u4e4b\u524d\u7684\u7248\u672c\u662f\u5f88\u5bb9\u6613\u7684\uff0c\u53ea\u9700\u8981\u4f7f\u7528 Git \u63d0\u4f9b\u7684reset\u547d\u4ee4\u3002<\/p>\n<p>\u5982\u8981\u56de\u9000\u7248\u672c\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u63d0\u4ea4\u70b9\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4e0b\u9762\u7684\u547d\u4ee4\uff1a<\/p>\n<p> git reset <\/p>\n<p>\u5176\u4e2d\uff0c  \u662f\u4f60\u8981\u56de\u9000\u5230\u7684\u7248\u672c\u7684 SHA \u6821\u9a8c\u548c\u6216\u7248\u672c\u53f7\u3002 <\/p>\n<p>\u4e5f\u53ef\u4ee5\u4f7f\u7528HEAD\u6765\u4ee3\u66ff  \u3002HEAD\u6307\u5411\u5f53\u524d\u7248\u672c\uff0c\u4ec5\u4ec5\u4fee\u6539 HEAD \u7684\u6307\u5411\uff0c\u4e0d\u6539\u53d8\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\u3002 <\/p>\n<p>\u4e09\u3001\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c<\/p>\n<p>\u5982\u679c\u8981\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b Git \u547d\u4ee4\uff1a<\/p>\n<p> git reset HEAD^ <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u5c06\u4f1a\u5c06\u5f53\u524d\u7248\u672c\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0cHEAD^ \u8868\u793a\u4e0a\u4e00\u4e2a\u7248\u672c\uff0cHEAD^^\u8868\u793a\u4e0a\u4e0a\u4e2a\u7248\u672c\u3002<\/p>\n<p>\u5982\u679c\u60f3\u56de\u9000\u66f4\u591a\u4e2a\u7248\u672c\uff0c\u7528 HEAD~n \u5373\u53ef\uff0c\u6bd4\u5982\u56de\u9000\u5230\u524d5\u4e2a\u7248\u672c\uff1a<\/p>\n<p> git reset HEAD~5 <\/p>\n<p>\u56db\u3001\u56de\u9000\u7248\u672c\u53ca\u4fdd\u7559\u66f4\u6539<\/p>\n<p>\u5982\u679c\u9700\u8981\u56de\u9000\u5230\u4ee5\u524d\u7684\u7248\u672c\uff0c\u5e76\u4fdd\u7559\u73b0\u5728\u5de5\u4f5c\u76ee\u5f55\u7684\u6539\u52a8\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528 Git \u63d0\u4f9b\u7684stash\u547d\u4ee4\u548cGit reset\u547d\u4ee4\u6765\u5b9e\u73b0\u3002<\/p>\n<p> git stash <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u628a\u6240\u6709\u7684\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u653e\u5165\u5230 Git \u7684 stash \u4e2d\u3002<\/p>\n<p>\u7136\u540e\uff0c\u6267\u884c\uff1a<\/p>\n<p> git reset <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u5c06\u56de\u9000\u5230\u4f60\u60f3\u8981\u7684\u7248\u672c\u3002<\/p>\n<p>\u73b0\u5728\u518d\u6b21\u6267\u884cstash\u547d\u4ee4\uff1a<\/p>\n<p> git stash <\/p>\n<p>\u5b83\u5c06\u53d6\u56de\u4e4b\u524d\u53d1\u5e03\u5230Git stash\u4e2d\u7684\u4fee\u6539\u3002<\/p>\n<p>\u4e94\u3001\u56de\u9000\u5df2\u7ecf\u63d0\u4ea4\u7684\u7248\u672c<\/p>\n<p>\u5982\u679c\u4f60\u5df2\u7ecf\u5411\u4ed3\u5e93\u63d0\u4ea4\u4e86\u4ee3\u7801\uff0c\u5e76\u4e14\u60f3\u8981\u56de\u9000\u63d0\u4ea4\u7684\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528 &#8211;hard \u53c2\u6570\u3002<\/p>\n<p>\u5207\u6362\u5230\u8981\u56de\u9000\u7684\u5206\u652f\uff0c\u5e76\u6267\u884c\u4e0b\u9762\u7684\u547d\u4ee4\uff1a<\/p>\n<p> git reset &#8211;hard <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u5c06\u64a4\u9500\u5230\u6307\u5b9a\u7248\u672c\uff0c\u5e76\u5220\u9664\u5de5\u4f5c\u76ee\u5f55\u4e2d\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u3002<\/p>\n<p>\u516d\u3001\u56de\u9000\u6267\u884c\u7ed3\u679c<\/p>\n<p>\u56de\u9000\u9879\u76ee\u7248\u672c\u65f6\uff0c\u53ef\u4ee5\u8fd0\u884c git revert \u547d\u4ee4\uff0c\u8be5\u547d\u4ee4\u4f1a\u56de\u9000\u6307\u5b9a\u7248\u672c\u7684\u4fee\u6539\uff0c\u5e76\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u5b58\u50a8\u8fd9\u4e9b\u88ab\u64a4\u9500\u7684\u66f4\u6539\u3002<\/p>\n<p>\u4f8b\u5982\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4f1a\u64a4\u9500\u63d0\u4ea4\u548c\u4fee\u6539\uff0c\u5c06\u4ee3\u7801\u56de\u9000\u5230\u7279\u5b9a\u63d0\u4ea4\uff1a<\/p>\n<p> git revert &#8211;no-commit  ..HEAD <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u5c06\u64a4\u9500  \u5230HEAD\u671f\u95f4\u7684\u6240\u6709\u66f4\u6539\uff0c\u5e76\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u5b58\u50a8\u8fd9\u4e9b\u53d8\u66f4\u3002 <\/p>\n<p>Git \u662f\u4e00\u4e2a\u975e\u5e38\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u80fd\u591f\u5bf9\u9879\u76ee\u8fdb\u884c\u7248\u672c\u63a7\u5236\u3001\u56de\u9000\u7b49\u64cd\u4f5c\u3002\u638c\u63e1 Git \u7684\u529f\u80fd\u548c\u57fa\u672c\u7528\u6cd5\uff0c\u5c06\u6709\u52a9\u4e8e\u5f00\u53d1\u4eba\u5458\u66f4\u597d\u5730\u7ba1\u7406\u9879\u76ee\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit \u600e\u4e48\u56de\u9000\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":"<p>\u4f5c\u4e3a\u7248\u672c\u63a7\u5236\u5de5\u5177\u7684 git\uff0c\u6700\u57fa\u672c\u7684\u529f\u80fd\u5c31\u662f\u8bb0\u5f55\u9879\u76ee\u7684\u5386\u53f2\u4fee\u6539\u4fe1\u606f\uff0c\u4ee5\u4fbf\u4e8e\u5f00\u53d1\u4eba\u5458\u4e86\u89e3\u9879\u76ee\u7684\u6f14\u53d8\u8fc7\u7a0b\uff0c\u5e76\u4e14\u63d0\u4f9b\u4e86\u4e00\u4e9b\u65b9\u4fbf\u7684\u64cd\u4f5c\u5de5\u5177\uff0c\u6bd4\u5982\u56de\u9000\u64cd\u4f5c\uff0c\u4ee5\u4fbf\u4e8e\u5f00\u53d1\u4eba\u5458\u5728\u9879\u76ee\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u66f4\u8f7b\u677e\u5730\u7ba1\u7406\u4ee3\u7801\u53d8\u66f4\u3002 Git \u53ef\u4ee5\u56de\u9000\u7248\u672c\uff0c\u8fd9\u5bf9\u5f00\u53d1\u4eba\u5458\u6765\u8bf4\u975e\u5e38\u6709\u7528\uff0c\u56e0\u4e3a\u4ed6\u4eec\u53ef\u4ee5\u56de\u5230\u4ee5\u524d\u7684\u7248\u672c\uff0c\u67e5\u770b\u4ee3\u7801\u5e76\u8fdb\u884c\u4fee\u6539\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528 Git \u56de\u9000\u7248\u672c\u3002 \u4e00\u3001\u67e5\u770b Git \u4e2d\u5f53\u524d\u7684\u7248\u672c\u4fe1\u606f \u5728\u56de\u9000\u7248\u672c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u5148\u67e5\u51fa\u5f53\u524d\u7248\u672c\u3002\u4f7f\u7528 Git \u63d0\u4f9b\u7684git log\u547d\u4ee4\uff0c\u53ef\u4ee5\u67e5\u770b\u5f53\u524d\u5206\u652f\u7684\u6240\u6709\u63d0\u4ea4\u5386\u53f2\uff0c\u4ee5\u53ca\u63d0\u4ea4\u65f6\u7684\u8be6\u7ec6\u4fe1\u606f\u3002 \u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a git log \u8be5\u547d\u4ee4\u5c06\u663e\u793a\u6240\u6709\u63d0\u4ea4\u7684 SHA-1 \u6821\u9a8c\u548c\u3001\u4f5c\u8005\u540d\u79f0\u3001\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3001\u63d0\u4ea4\u65e5\u671f\u548c\u63d0\u4ea4\u8bf4\u660e\u7b49\u8be6\u7ec6\u4fe1\u606f\u3002 \u5982\u679c\u5728\u663e\u793a\u6240\u6709\u5386\u53f2\u8bb0\u5f55\u65f6\uff0c\u5c4f\u5e55\u4fe1\u606f\u8fc7\u591a\u65e0\u6cd5\u770b\u5b8c\uff0c\u53ef\u4ee5\u6309q\u952e\u9000\u51fa\u3002 \u4e8c\u3001\u56de\u9000\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u7248\u672c \u5728 Git \u4e2d\u56de\u9000\u5230\u4e4b\u524d\u7684\u7248\u672c\u662f\u5f88\u5bb9\u6613\u7684\uff0c\u53ea\u9700\u8981\u4f7f\u7528 Git \u63d0\u4f9b\u7684reset\u547d\u4ee4\u3002 \u5982\u8981\u56de\u9000\u7248\u672c\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u63d0\u4ea4\u70b9\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4e0b\u9762\u7684\u547d\u4ee4\uff1a git reset \u5176\u4e2d\uff0c \u662f\u4f60\u8981\u56de\u9000\u5230\u7684\u7248\u672c\u7684 SHA \u6821\u9a8c\u548c\u6216\u7248\u672c\u53f7\u3002 \u4e5f\u53ef\u4ee5\u4f7f\u7528HEAD\u6765\u4ee3\u66ff \u3002HEAD\u6307\u5411\u5f53\u524d\u7248\u672c\uff0c\u4ec5\u4ec5\u4fee\u6539 HEAD \u7684\u6307\u5411\uff0c\u4e0d\u6539\u53d8\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\u3002 \u4e09\u3001\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c \u5982\u679c\u8981\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b Git \u547d\u4ee4\uff1a git reset HEAD^ \u8fd9\u4e2a\u547d\u4ee4\u5c06\u4f1a\u5c06\u5f53\u524d\u7248\u672c\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0cHEAD^ \u8868\u793a\u4e0a\u4e00\u4e2a\u7248\u672c\uff0cHEAD^^\u8868\u793a\u4e0a\u4e0a\u4e2a\u7248\u672c\u3002 \u5982\u679c\u60f3\u56de\u9000\u66f4\u591a\u4e2a\u7248\u672c\uff0c\u7528 HEAD~n \u5373\u53ef\uff0c\u6bd4\u5982\u56de\u9000\u5230\u524d5\u4e2a\u7248\u672c\uff1a git reset HEAD~5 \u56db\u3001\u56de\u9000\u7248\u672c\u53ca\u4fdd\u7559\u66f4\u6539 \u5982\u679c\u9700\u8981\u56de\u9000\u5230\u4ee5\u524d\u7684\u7248\u672c\uff0c\u5e76\u4fdd\u7559\u73b0\u5728\u5de5\u4f5c\u76ee\u5f55\u7684\u6539\u52a8\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528 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-19080","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19080","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=19080"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19080\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19080"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19080"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19080"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}