{"id":19258,"date":"2024-11-19T10:31:10","date_gmt":"2024-11-19T02:31:10","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19258\/"},"modified":"2024-11-19T10:31:10","modified_gmt":"2024-11-19T02:31:10","slug":"%e8%af%a6%e8%a7%a3git%e6%89%be%e5%9b%9e%e5%88%a0%e9%99%a4%e6%96%87%e4%bb%b6%e7%9a%84%e5%87%a0%e7%a7%8d%e6%96%b9%e6%b3%95","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19258\/","title":{"rendered":"\u8be6\u89e3git\u627e\u56de\u5220\u9664\u6587\u4ef6\u7684\u51e0\u79cd\u65b9\u6cd5"},"content":{"rendered":"

\u5728\u4f7f\u7528 git \u8fdb\u884c\u4ee3\u7801\u7248\u672c\u63a7\u5236\u65f6\uff0c\u6709\u65f6\u5019\u4f1a\u8bef\u5220\u9664\u67d0\u4e2a\u6587\u4ef6\uff0c\u8fd9\u65f6\u5019\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7 git \u7684\u4e00\u4e9b\u795e\u5947\u64cd\u4f5c\u5c06\u8fd9\u4e9b\u8bef\u5220\u9664\u7684\u6587\u4ef6\u627e\u56de\u6765\uff0c\u672c\u6587\u5c06\u4ecb\u7ecd git \u627e\u56de\u5220\u9664\u6587\u4ef6\u7684\u51e0\u79cd\u65b9\u6cd5\u3002<\/p>\n

1. \u4f7f\u7528 checkout \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6<\/h2>\n

\u5982\u679c\u6211\u4eec\u8bef\u5220\u9664\u4e86\u67d0\u4e2a\u6587\u4ef6\uff0c\u53ef\u4ee5\u901a\u8fc7\u4f7f\u7528 checkout \u547d\u4ee4\u6765\u6062\u590d\uff1a<\/p>\n

git checkout -- <file_path><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u4e2a\u547d\u4ee4\u7684\u542b\u4e49\u662f\u5c06\u8be5\u6587\u4ef6\u6062\u590d\u5230\u6700\u65b0\u7684\u7248\u672c\u3002\u5982\u679c\u8be5\u6587\u4ef6\u66fe\u7ecf\u63d0\u4ea4\u5230\u8fc7 Git \u4e2d\uff0c\u5219\u4f1a\u6062\u590d\u5230\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u8be5\u6587\u4ef6\u7684\u7248\u672c\u3002\u5982\u679c\u8fd9\u4e2a\u6587\u4ef6\u6ca1\u6709\u63d0\u4ea4\u8fc7\uff0c\u53c8\u88ab\u8bef\u5220\u9664\u4e86\uff0c\u5219\u53ef\u4ee5\u901a\u8fc7 checkout \u547d\u4ee4\u6062\u590d\u4e3a\u5f53\u524d\u672a\u63d0\u4ea4\u7684\u72b6\u6001\u3002<\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u4f7f\u7528 checkout \u547d\u4ee4\u4f1a\u8986\u76d6\u6389\u672c\u5730\u7684\u4fee\u6539\uff0c\u6240\u4ee5\u5728\u4f7f\u7528\u524d\u9700\u8981\u5c06\u672c\u5730\u7684\u4fee\u6539\u8fdb\u884c\u5907\u4efd\u6216\u8005\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u3002<\/p>\n
2. \u4f7f\u7528 reset \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6<\/h2>\n
\u540c\u6837\u7684\uff0c\u6211\u4eec\u4e5f\u53ef\u4ee5\u4f7f\u7528 reset \u547d\u4ee4\u8fdb\u884c\u6062\u590d\u6587\u4ef6\uff1a<\/p>\n
git reset HEAD <file_path><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u4e2a\u547d\u4ee4\u7684\u542b\u4e49\u662f\u5c06\u8be5\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u6062\u590d\u5230\u5de5\u4f5c\u533a\uff0c\u4e5f\u5c31\u662f\u53d6\u6d88\u5bf9\u8be5\u6587\u4ef6\u7684\u6682\u5b58\u3002\u5982\u679c\u6211\u4eec\u521a\u521a\u5c06\u8be5\u6587\u4ef6\u5220\u9664\u65f6\u6ca1\u6709\u6267\u884c commit \u547d\u4ee4\uff0c\u5219\u8be5\u6587\u4ef6\u662f\u5728\u6682\u5b58\u533a\u88ab\u5220\u9664\u7684\u3002\u4f7f\u7528 reset \u547d\u4ee4\u53ef\u4ee5\u5c06\u8be5\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u6062\u590d\u5230\u5de5\u4f5c\u533a\u3002<\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u4f7f\u7528 reset \u547d\u4ee4\u4e0d\u4f1a\u5220\u9664\u6587\u4ef6\uff0c\u53ea\u662f\u5c06\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u79fb\u52a8\u56de\u5de5\u4f5c\u533a\u3002\u5982\u679c\u9700\u8981\u5c06\u6587\u4ef6\u5b8c\u5168\u5220\u9664\uff0c\u5219\u53ef\u4ee5\u4f7f\u7528 rm \u547d\u4ee4\u5c06\u5176\u5220\u9664\uff0c\u7136\u540e\u518d\u4f7f\u7528 commit \u547d\u4ee4\u63d0\u4ea4\u5220\u9664\u64cd\u4f5c\u3002<\/p>\n
3. \u4f7f\u7528 reflog \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6<\/h2>\n
\u5982\u679c\u6211\u4eec\u8bef\u5220\u9664\u67d0\u4e2a\u6587\u4ef6\uff0c\u5e76\u4e14\u4e4b\u524d\u7684\u4e00\u4e9b\u64cd\u4f5c\u5df2\u7ecf\u63d0\u4ea4\u5230\u4e86\u7248\u672c\u5e93\uff0c\u5219\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 Git \u7684 reflog \u547d\u4ee4\u6765\u627e\u56de\u8fd9\u4e2a\u6587\u4ef6\u3002<\/p>\n
reflog \u547d\u4ee4\u8bb0\u5f55\u4e86 Git \u7684\u6240\u6709\u64cd\u4f5c\uff0c\u5305\u62ec\u6bcf\u6b21\u63d0\u4ea4\u3001\u5408\u5e76\u3001\u91cd\u7f6e\u7b49\u3002\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b reflog\uff1a<\/p>\n
git reflog<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5217\u51fa Git \u7684\u6240\u6709\u64cd\u4f5c\u8bb0\u5f55\uff0c\u5305\u62ec\u64cd\u4f5c\u7684 SHA1 \u7248\u672c\u53f7\u548c\u63d0\u4ea4\u7684\u6ce8\u91ca\u3002\u8bb0\u5f55\u7684\u7f16\u53f7\u8d8a\u5c0f\uff0c\u8d8a\u9760\u8fd1\u5f53\u524d\u72b6\u6001\u3002<\/p>\n
\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u5728 reflog \u4e2d\u627e\u5230\u8bef\u5220\u9664\u6587\u4ef6\u7684 SHA1 \u7248\u672c\u53f7\uff0c\u7136\u540e\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u6062\u590d\uff1a<\/p>\n
git checkout HEAD@{<commit-number>} <file_path><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d  \u8868\u793a\u8981\u6062\u590d\u7684\u63d0\u4ea4\u7248\u672c\u53f7\u3002\u6211\u4eec\u53ef\u4ee5\u5728 reflog \u4e2d\u627e\u5230\u8bef\u5220\u9664\u6587\u4ef6\u7684 commit-number\uff0c\u7136\u540e\u5c06\u5176\u66ff\u6362\u5230\u4e0a\u9762\u7684\u547d\u4ee4\u4e2d\u3002 <\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u5982\u679c\u4e4b\u524d\u8fdb\u884c\u4e86\u5408\u5e76\u6216\u8005\u91cd\u7f6e\u64cd\u4f5c\uff0c\u5728\u4f7f\u7528 reflog \u6062\u590d\u6587\u4ef6\u65f6\u53ef\u80fd\u4f1a\u4ea7\u751f\u51b2\u7a81\uff0c\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n
\u7ed3\u8bba<\/h2>\n
\u8bef\u5220\u9664\u6587\u4ef6\u662f\u5f00\u53d1\u4eba\u5458\u7ecf\u5e38\u9047\u5230\u7684\u95ee\u9898\uff0c\u4f46\u662f Git \u63d0\u4f9b\u4e86\u5f88\u591a\u65b9\u6cd5\u6765\u5e2e\u52a9\u6211\u4eec\u627e\u56de\u8fd9\u4e9b\u8bef\u5220\u9664\u7684\u6587\u4ef6\u3002\u672c\u6587\u4ecb\u7ecd\u4e86\u4f7f\u7528 checkout\u3001reset \u548c reflog \u8fdb\u884c\u6587\u4ef6\u6062\u590d\u7684\u65b9\u6cd5\uff0c\u9700\u8981\u6839\u636e\u4e0d\u540c\u7684\u573a\u666f\u9009\u62e9\u5408\u9002\u7684\u65b9\u6cd5\u8fdb\u884c\u64cd\u4f5c\u3002\u5728\u8fdb\u884c\u6062\u590d\u64cd\u4f5c\u4e4b\u524d\uff0c\u9700\u8981\u6ce8\u610f\u5907\u4efd\u672c\u5730\u4fee\u6539\u6216\u8005\u63d0\u4ea4\u5230\u7248\u672c\u5e93\uff0c\u907f\u514d\u51fa\u73b0\u6570\u636e\u4e22\u5931\u7684\u60c5\u51b5\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u8be6\u89e3git\u627e\u56de\u5220\u9664\u6587\u4ef6\u7684\u51e0\u79cd\u65b9\u6cd5\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":"
\u5728\u4f7f\u7528 git \u8fdb\u884c\u4ee3\u7801\u7248\u672c\u63a7\u5236\u65f6\uff0c\u6709\u65f6\u5019\u4f1a\u8bef\u5220\u9664\u67d0\u4e2a\u6587\u4ef6\uff0c\u8fd9\u65f6\u5019\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7 git \u7684\u4e00\u4e9b\u795e\u5947\u64cd\u4f5c\u5c06\u8fd9\u4e9b\u8bef\u5220\u9664\u7684\u6587\u4ef6\u627e\u56de\u6765\uff0c\u672c\u6587\u5c06\u4ecb\u7ecd git \u627e\u56de\u5220\u9664\u6587\u4ef6\u7684\u51e0\u79cd\u65b9\u6cd5\u3002 1. \u4f7f\u7528 checkout \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6 \u5982\u679c\u6211\u4eec\u8bef\u5220\u9664\u4e86\u67d0\u4e2a\u6587\u4ef6\uff0c\u53ef\u4ee5\u901a\u8fc7\u4f7f\u7528 checkout \u547d\u4ee4\u6765\u6062\u590d\uff1a git checkout — <file_path> \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u7684\u542b\u4e49\u662f\u5c06\u8be5\u6587\u4ef6\u6062\u590d\u5230\u6700\u65b0\u7684\u7248\u672c\u3002\u5982\u679c\u8be5\u6587\u4ef6\u66fe\u7ecf\u63d0\u4ea4\u5230\u8fc7 Git \u4e2d\uff0c\u5219\u4f1a\u6062\u590d\u5230\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u8be5\u6587\u4ef6\u7684\u7248\u672c\u3002\u5982\u679c\u8fd9\u4e2a\u6587\u4ef6\u6ca1\u6709\u63d0\u4ea4\u8fc7\uff0c\u53c8\u88ab\u8bef\u5220\u9664\u4e86\uff0c\u5219\u53ef\u4ee5\u901a\u8fc7 checkout \u547d\u4ee4\u6062\u590d\u4e3a\u5f53\u524d\u672a\u63d0\u4ea4\u7684\u72b6\u6001\u3002 \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u4f7f\u7528 checkout \u547d\u4ee4\u4f1a\u8986\u76d6\u6389\u672c\u5730\u7684\u4fee\u6539\uff0c\u6240\u4ee5\u5728\u4f7f\u7528\u524d\u9700\u8981\u5c06\u672c\u5730\u7684\u4fee\u6539\u8fdb\u884c\u5907\u4efd\u6216\u8005\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u3002 2. \u4f7f\u7528 reset \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6 \u540c\u6837\u7684\uff0c\u6211\u4eec\u4e5f\u53ef\u4ee5\u4f7f\u7528 reset \u547d\u4ee4\u8fdb\u884c\u6062\u590d\u6587\u4ef6\uff1a git reset HEAD <file_path> \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u7684\u542b\u4e49\u662f\u5c06\u8be5\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u6062\u590d\u5230\u5de5\u4f5c\u533a\uff0c\u4e5f\u5c31\u662f\u53d6\u6d88\u5bf9\u8be5\u6587\u4ef6\u7684\u6682\u5b58\u3002\u5982\u679c\u6211\u4eec\u521a\u521a\u5c06\u8be5\u6587\u4ef6\u5220\u9664\u65f6\u6ca1\u6709\u6267\u884c commit \u547d\u4ee4\uff0c\u5219\u8be5\u6587\u4ef6\u662f\u5728\u6682\u5b58\u533a\u88ab\u5220\u9664\u7684\u3002\u4f7f\u7528 reset \u547d\u4ee4\u53ef\u4ee5\u5c06\u8be5\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u6062\u590d\u5230\u5de5\u4f5c\u533a\u3002 \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u4f7f\u7528 reset \u547d\u4ee4\u4e0d\u4f1a\u5220\u9664\u6587\u4ef6\uff0c\u53ea\u662f\u5c06\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u79fb\u52a8\u56de\u5de5\u4f5c\u533a\u3002\u5982\u679c\u9700\u8981\u5c06\u6587\u4ef6\u5b8c\u5168\u5220\u9664\uff0c\u5219\u53ef\u4ee5\u4f7f\u7528 rm \u547d\u4ee4\u5c06\u5176\u5220\u9664\uff0c\u7136\u540e\u518d\u4f7f\u7528 commit \u547d\u4ee4\u63d0\u4ea4\u5220\u9664\u64cd\u4f5c\u3002 3. \u4f7f\u7528 reflog \u6062\u590d\u5220\u9664\u7684\u6587\u4ef6 […]<\/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-19258","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19258","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=19258"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19258\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19258"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19258"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19258"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}