{"id":20264,"date":"2024-11-19T08:12:06","date_gmt":"2024-11-19T00:12:06","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20264\/"},"modified":"2024-11-19T08:12:06","modified_gmt":"2024-11-19T00:12:06","slug":"git-reset%e5%90%8e%e5%a6%82%e4%bd%95%e6%89%be%e5%9b%9e%e4%bb%a3%e7%a0%81","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20264\/","title":{"rendered":"git reset\u540e\u5982\u4f55\u627e\u56de\u4ee3\u7801"},"content":{"rendered":"<p>\u5728\u4f7f\u7528 git \u8fdb\u884c\u7248\u672c\u63a7\u5236\u7684\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4ee3\u7801\u4e22\u5931\u7684\u60c5\u51b5\uff0c\u5176\u4e2d\u4e4b\u4e00\u5c31\u662f\u4f7f\u7528 git reset \u547d\u4ee4\u5c06\u4ee3\u7801\u56de\u9000\u81f3\u67d0\u4e2a\u5386\u53f2\u7248\u672c\u3002\u5f53\u6211\u4eec\u56de\u9000\u5230\u4e00\u4e2a\u5386\u53f2\u7248\u672c\u540e\uff0c\u539f\u6765\u6700\u65b0\u7684\u4ee3\u7801\u5c06\u4f1a\u88ab\u8986\u76d6\uff0c\u5982\u679c\u6ca1\u6709\u53ca\u65f6\u5907\u4efd\uff0c\u90a3\u4e48\u8fd9\u90e8\u5206\u4ee3\u7801\u5c31\u4f1a\u88ab\u6c38\u4e45\u4e22\u5931\u3002\u90a3\u4e48\uff0c\u5982\u679c\u53d1\u751f\u4e86\u8fd9\u79cd\u60c5\u51b5\uff0c\u6211\u4eec\u8981\u5982\u4f55\u627e\u56de\u4e22\u5931\u7684\u4ee3\u7801\u5462\uff1f<\/p>\n<ol>\n<li>\u4f7f\u7528 git reflog \u547d\u4ee4<\/li>\n<\/ol>\n<p>git reflog \u547d\u4ee4\u53ef\u4ee5\u67e5\u770b\u5f53\u524d\u4ed3\u5e93\u4e2d\u6267\u884c\u7684\u6240\u6709\u64cd\u4f5c\u8bb0\u5f55\uff0c\u5305\u62ec commit\u3001checkout\u3001reset \u7b49\u64cd\u4f5c\u3002\u5728\u4f7f\u7528 git reset \u547d\u4ee4\u65f6\uff0c\u5b83\u4f1a\u4ea7\u751f\u4e00\u6761\u64cd\u4f5c\u8bb0\u5f55\uff0c\u56e0\u6b64\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 git reflog \u547d\u4ee4\u6765\u67e5\u770b\u5230\u8fbe\u8fc7\u54ea\u4e9b\u5386\u53f2\u7248\u672c\u3002\u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\u5982\u4e0b\uff1a<\/p>\n<ul>\n<li>\u6253\u5f00\u547d\u4ee4\u884c\u5de5\u5177\uff0c\u8fdb\u5165\u5230\u4ee3\u7801\u5b58\u50a8\u7684\u76ee\u5f55\u4e0b\uff1b<\/li>\n<li>\u6267\u884c git reflog \u547d\u4ee4\uff0c\u4f1a\u663e\u793a\u6240\u6709\u7684\u64cd\u4f5c\u8bb0\u5f55\uff1b<\/li>\n<li>\u590d\u5236\u56de\u9000\u5230\u5386\u53f2\u7248\u672c\u7684\u64cd\u4f5c\u8bb0\u5f55\u7684 SHA \u503c\uff1b<\/li>\n<li>\u6267\u884c git reset  \u547d\u4ee4\uff0c\u5c06\u4ee3\u7801\u8fd8\u539f\u5230\u6307\u5b9a\u7684\u5386\u53f2\u7248\u672c\u3002  <\/li>\n<\/ul>\n<p>\u8bf7\u6ce8\u610f\uff0c\u5728\u4f7f\u7528 git reset \u547d\u4ee4\u6062\u590d\u4ee3\u7801\u65f6\uff0c\u6211\u4eec\u9700\u8981\u786e\u4fdd\u5c06\u4ee3\u7801\u8fd8\u539f\u5230\u6b63\u786e\u7684\u5386\u53f2\u7248\u672c\uff0c\u5426\u5219\u4f1a\u4e22\u5931\u66f4\u591a\u7684\u4ee3\u7801\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528 git fsck \u547d\u4ee4<\/li>\n<\/ol>\n<p>git fsck \u547d\u4ee4\u53ef\u4ee5\u68c0\u67e5 Git \u6570\u636e\u5e93\u4e2d\u6240\u6709\u7684\u5bf9\u8c61\uff0c\u5305\u62ec\u63d0\u4ea4\u8bb0\u5f55\u3001\u5206\u652f\u3001\u6807\u7b7e\u7b49\uff0c\u67e5\u627e\u51fa\u672a\u4f7f\u7528\u7684\u6216\u8005\u4e22\u5931\u7684\u5bf9\u8c61\uff0c\u5e76\u6253\u5370\u51fa\u8fd9\u4e9b\u5bf9\u8c61\u7684 SHA \u503c\u3002\u5982\u679c\u6211\u4eec\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4e86\u4ee3\u7801\u4e22\u5931\uff0c\u90a3\u4e48\u4e5f\u53ef\u80fd\u662f\u67d0\u4e9b\u5bf9\u8c61\u88ab\u8bef\u5220\u4e86\u3002\u4f7f\u7528 git fsck \u547d\u4ee4\u53ef\u4ee5\u67e5\u627e\u5230\u8fd9\u4e9b\u4e22\u5931\u7684\u5bf9\u8c61\uff0c\u5e76\u5c06\u5176\u6062\u590d\u3002\u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\u5982\u4e0b\uff1a<\/p>\n<ul>\n<li>\u6253\u5f00\u547d\u4ee4\u884c\u5de5\u5177\uff0c\u8fdb\u5165\u5230\u4ee3\u7801\u5b58\u50a8\u7684\u76ee\u5f55\u4e0b\uff1b<\/li>\n<li>\u6267\u884c git fsck &#8211;full \u547d\u4ee4\uff0c\u68c0\u67e5 Git \u6570\u636e\u5e93\uff0c\u67e5\u627e\u4e22\u5931\u7684\u5bf9\u8c61\uff1b<\/li>\n<li>\u82e5 Git \u6570\u636e\u5e93\u4e2d\u786e\u5b9e\u5b58\u5728\u4e22\u5931\u5bf9\u8c61\uff0c\u6267\u884c git cat-file -p  \u547d\u4ee4\uff0c\u5c06\u5bf9\u8c61\u6253\u5370\u51fa\u6765\uff1b  <\/li>\n<li>\u82e5\u6253\u5370\u51fa\u7684\u5bf9\u8c61\u662f\u63d0\u4ea4\u8bb0\u5f55\uff0c\u6267\u884c git merge  \u547d\u4ee4\uff0c\u5c06\u5176\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\uff1b  <\/li>\n<li>\u82e5\u6253\u5370\u51fa\u7684\u5bf9\u8c61\u662f\u6587\u4ef6\uff0c\u6267\u884c git cat-file -p  &gt; filename \u547d\u4ee4\uff0c\u5c06\u6587\u4ef6\u6062\u590d\u5230\u672c\u5730\u3002  <\/li>\n<\/ul>\n<p>\u8bf7\u6ce8\u610f\uff0c\u4f7f\u7528 git fsck \u547d\u4ee4\u8fdb\u884c\u6570\u636e\u6062\u590d\u65f6\uff0c\u9700\u8981\u5c0f\u5fc3\u8c28\u614e\uff0c\u5c3d\u53ef\u80fd\u786e\u8ba4\u6bcf\u4e2a\u4e22\u5931\u7684\u5bf9\u8c61\u3002\u5982\u679c\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4e86 Git \u6570\u636e\u5e93\u5b8c\u6574\u6027\u95ee\u9898\uff0c\u53ef\u80fd\u9700\u8981\u4f7f\u7528 Git \u6570\u636e\u5e93\u4fee\u590d\u5de5\u5177\u8fdb\u884c\u4fee\u590d\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528\u7b2c\u4e09\u65b9\u6570\u636e\u6062\u590d\u5de5\u5177<\/li>\n<\/ol>\n<p>\u5982\u679c\u4ee5\u4e0a\u65b9\u6cd5\u4ecd\u65e0\u6cd5\u627e\u56de\u4ee3\u7801\uff0c\u5e76\u4e14\u6570\u636e\u975e\u5e38\u91cd\u8981\uff0c\u6216\u8005\u4ee5\u4e0a\u65b9\u6cd5\u64cd\u4f5c\u8d77\u6765\u6bd4\u8f83\u56f0\u96be\uff0c\u53ef\u4ee5\u4f7f\u7528\u7b2c\u4e09\u65b9\u6570\u636e\u6062\u590d\u5de5\u5177\u6765\u5c1d\u8bd5\u6062\u590d\u4e22\u5931\u7684\u4ee3\u7801\u3002\u8fd9\u4e9b\u5de5\u5177\u901a\u5e38\u53ef\u4ee5\u626b\u63cf\u786c\u76d8\u6216\u8005 U \u76d8\uff0c\u5e76\u6062\u590d\u5df2\u7ecf\u88ab\u5220\u9664\u7684\u6587\u4ef6\u3002\u5e38\u89c1\u7684\u6570\u636e\u6062\u590d\u5de5\u5177\u5305\u62ec Recuva\u3001EaseUS Data Recovery Wizard\u3001Disk Drill \u7b49\u3002\u8bf7\u6ce8\u610f\uff0c\u5728\u4f7f\u7528\u8fd9\u4e9b\u5de5\u5177\u65f6\uff0c\u9700\u8981\u5c0f\u5fc3\u64cd\u4f5c\uff0c\u4ee5\u514d\u8fdb\u4e00\u6b65\u635f\u574f\u6570\u636e\u3002<\/p>\n<p>\u603b\u4e4b\uff0cGit \u63d0\u4f9b\u4e86\u5404\u79cd\u65b9\u6cd5\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u627e\u56de\u4e22\u5931\u7684\u4ee3\u7801\uff0c\u5c24\u5176\u662f git reflog \u547d\u4ee4\u548c git fsck \u547d\u4ee4\uff0c\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u627e\u56de\u8bef\u64cd\u4f5c\u56de\u9000\u7684\u5386\u53f2\u7248\u672c\u6216\u8005\u4e22\u5931\u7684\u5bf9\u8c61\u3002\u5728\u8fdb\u884c\u6570\u636e\u6062\u590d\u65f6\uff0c\u9700\u8981\u6ce8\u610f\u64cd\u4f5c\u7684\u51c6\u786e\u6027\u548c\u5b89\u5168\u6027\uff0c\u4ee5\u514d\u8fdb\u4e00\u6b65\u635f\u574f\u6570\u636e\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit reset\u540e\u5982\u4f55\u627e\u56de\u4ee3\u7801\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\u7528 git \u8fdb\u884c\u7248\u672c\u63a7\u5236\u7684\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4ee3\u7801\u4e22\u5931\u7684\u60c5\u51b5\uff0c\u5176\u4e2d\u4e4b\u4e00\u5c31\u662f\u4f7f\u7528 git reset \u547d\u4ee4\u5c06\u4ee3\u7801\u56de\u9000\u81f3\u67d0\u4e2a\u5386\u53f2\u7248\u672c\u3002\u5f53\u6211\u4eec\u56de\u9000\u5230\u4e00\u4e2a\u5386\u53f2\u7248\u672c\u540e\uff0c\u539f\u6765\u6700\u65b0\u7684\u4ee3\u7801\u5c06\u4f1a\u88ab\u8986\u76d6\uff0c\u5982\u679c\u6ca1\u6709\u53ca\u65f6\u5907\u4efd\uff0c\u90a3\u4e48\u8fd9\u90e8\u5206\u4ee3\u7801\u5c31\u4f1a\u88ab\u6c38\u4e45\u4e22\u5931\u3002\u90a3\u4e48\uff0c\u5982\u679c\u53d1\u751f\u4e86\u8fd9\u79cd\u60c5\u51b5\uff0c\u6211\u4eec\u8981\u5982\u4f55\u627e\u56de\u4e22\u5931\u7684\u4ee3\u7801\u5462\uff1f \u4f7f\u7528 git reflog \u547d\u4ee4 git reflog \u547d\u4ee4\u53ef\u4ee5\u67e5\u770b\u5f53\u524d\u4ed3\u5e93\u4e2d\u6267\u884c\u7684\u6240\u6709\u64cd\u4f5c\u8bb0\u5f55\uff0c\u5305\u62ec commit\u3001checkout\u3001reset \u7b49\u64cd\u4f5c\u3002\u5728\u4f7f\u7528 git reset \u547d\u4ee4\u65f6\uff0c\u5b83\u4f1a\u4ea7\u751f\u4e00\u6761\u64cd\u4f5c\u8bb0\u5f55\uff0c\u56e0\u6b64\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 git reflog \u547d\u4ee4\u6765\u67e5\u770b\u5230\u8fbe\u8fc7\u54ea\u4e9b\u5386\u53f2\u7248\u672c\u3002\u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\u5982\u4e0b\uff1a \u6253\u5f00\u547d\u4ee4\u884c\u5de5\u5177\uff0c\u8fdb\u5165\u5230\u4ee3\u7801\u5b58\u50a8\u7684\u76ee\u5f55\u4e0b\uff1b \u6267\u884c git reflog \u547d\u4ee4\uff0c\u4f1a\u663e\u793a\u6240\u6709\u7684\u64cd\u4f5c\u8bb0\u5f55\uff1b \u590d\u5236\u56de\u9000\u5230\u5386\u53f2\u7248\u672c\u7684\u64cd\u4f5c\u8bb0\u5f55\u7684 SHA \u503c\uff1b \u6267\u884c git reset \u547d\u4ee4\uff0c\u5c06\u4ee3\u7801\u8fd8\u539f\u5230\u6307\u5b9a\u7684\u5386\u53f2\u7248\u672c\u3002 \u8bf7\u6ce8\u610f\uff0c\u5728\u4f7f\u7528 git reset \u547d\u4ee4\u6062\u590d\u4ee3\u7801\u65f6\uff0c\u6211\u4eec\u9700\u8981\u786e\u4fdd\u5c06\u4ee3\u7801\u8fd8\u539f\u5230\u6b63\u786e\u7684\u5386\u53f2\u7248\u672c\uff0c\u5426\u5219\u4f1a\u4e22\u5931\u66f4\u591a\u7684\u4ee3\u7801\u3002 \u4f7f\u7528 git fsck \u547d\u4ee4 git fsck \u547d\u4ee4\u53ef\u4ee5\u68c0\u67e5 Git \u6570\u636e\u5e93\u4e2d\u6240\u6709\u7684\u5bf9\u8c61\uff0c\u5305\u62ec\u63d0\u4ea4\u8bb0\u5f55\u3001\u5206\u652f\u3001\u6807\u7b7e\u7b49\uff0c\u67e5\u627e\u51fa\u672a\u4f7f\u7528\u7684\u6216\u8005\u4e22\u5931\u7684\u5bf9\u8c61\uff0c\u5e76\u6253\u5370\u51fa\u8fd9\u4e9b\u5bf9\u8c61\u7684 SHA \u503c\u3002\u5982\u679c\u6211\u4eec\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4e86\u4ee3\u7801\u4e22\u5931\uff0c\u90a3\u4e48\u4e5f\u53ef\u80fd\u662f\u67d0\u4e9b\u5bf9\u8c61\u88ab\u8bef\u5220\u4e86\u3002\u4f7f\u7528 git fsck \u547d\u4ee4\u53ef\u4ee5\u67e5\u627e\u5230\u8fd9\u4e9b\u4e22\u5931\u7684\u5bf9\u8c61\uff0c\u5e76\u5c06\u5176\u6062\u590d\u3002\u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\u5982\u4e0b\uff1a \u6253\u5f00\u547d\u4ee4\u884c\u5de5\u5177\uff0c\u8fdb\u5165\u5230\u4ee3\u7801\u5b58\u50a8\u7684\u76ee\u5f55\u4e0b\uff1b \u6267\u884c git fsck [&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-20264","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20264","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=20264"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20264\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20264"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20264"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20264"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}