{"id":19555,"date":"2024-11-19T14:35:52","date_gmt":"2024-11-19T06:35:52","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19555\/"},"modified":"2024-11-19T14:35:52","modified_gmt":"2024-11-19T06:35:52","slug":"%e4%b8%80%e4%ba%9b%e5%a4%84%e7%90%86git%e6%9c%ac%e5%9c%b0%e8%af%af%e5%88%a0%e7%9a%84%e6%96%b9%e6%b3%95%e5%92%8c%e6%8a%80%e5%b7%a7","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19555\/","title":{"rendered":"\u4e00\u4e9b\u5904\u7406git\u672c\u5730\u8bef\u5220\u7684\u65b9\u6cd5\u548c\u6280\u5de7"},"content":{"rendered":"

git\u662f\u5e7f\u6cdb\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u53ef\u4ee5\u65b9\u4fbf\u5730\u7ba1\u7406\u4ee3\u7801\u53ca\u5176\u5386\u53f2\u8bb0\u5f55\u3002\u7136\u800c\uff0c\u6709\u65f6\u6211\u4eec\u4f1a\u4e0d\u5c0f\u5fc3\u5728\u672c\u5730\u8bef\u5220\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u8fd9\u5bf9\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u6027\u548c\u5b89\u5168\u6027\u90fd\u4f1a\u4ea7\u751f\u5f71\u54cd\u3002\u8fd9\u7bc7\u6587\u7ae0\u5c06\u4ecb\u7ecd\u4e00\u4e9b\u5904\u7406git\u672c\u5730\u8bef\u5220\u7684\u65b9\u6cd5\u548c\u6280\u5de7\u3002<\/p>\n

    \n
  1. \u4f7f\u7528git\u547d\u4ee4\u6062\u590d\u6587\u4ef6<\/li>\n<\/ol>\n

    \u5f53\u6211\u4eec\u5728\u672c\u5730\u8bef\u5220\u4e86\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528git\u547d\u4ee4\u6765\u6062\u590d\u5b83\u4eec\u3002\u9996\u5148\uff0c\u9700\u8981\u77e5\u9053\u5220\u9664\u7684\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u7684\u51c6\u786e\u8def\u5f84\u548c\u540d\u79f0\u3002\u7136\u540e\uff0c\u5728\u7ec8\u7aef\u4e2d\u4f7f\u7528\u4ee5\u4e0bgit\u547d\u4ee4\uff1a<\/p>\n

    git checkout -- path\/to\/file<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5982\u679c\u8981\u6062\u590d\u6574\u4e2a\u6587\u4ef6\u5939\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
    git checkout -- path\/to\/folder\/<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u8fd9\u5c06\u6062\u590d\u88ab\u5220\u9664\u7684\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u5e76\u8986\u76d6\u5f53\u524d\u5206\u652f\u4e2d\u7684\u76f8\u5e94\u6587\u4ef6\u3002<\/p>\n
      \n
    1. \u4f7f\u7528git log\u67e5\u770b\u5386\u53f2\u8bb0\u5f55<\/li>\n<\/ol>\n
      \u5982\u679c\u4f60\u4e0d\u786e\u5b9a\u88ab\u8bef\u5220\u7684\u6587\u4ef6\u7684\u8def\u5f84\u548c\u540d\u79f0\uff0c\u53ef\u4ee5\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u6700\u8fd1\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u4e86\u89e3\u54ea\u4e9b\u6587\u4ef6\u88ab\u5220\u9664\u4e86\u3002\u5728\u7ec8\u7aef\u4e2d\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
      git log --oneline --diff-filter=D<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8fd9\u5c06\u663e\u793a\u6240\u6709\u88ab\u5220\u9664\u7684\u6587\u4ef6\u53ca\u5176\u5220\u9664\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u4f60\u53ef\u4ee5\u590d\u5236\u8be5\u63d0\u4ea4\u8bb0\u5f55\u7684SHA\u503c\uff0c\u7136\u540e\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u6062\u590d\u5b83\uff1a<\/p>\n
      git checkout <commit hash> -- path\/to\/file<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \n
      1. \u4f7f\u7528git stash\u6062\u590d\u88ab\u8bef\u5220\u7684\u4fee\u6539<\/li>\n<\/ol>\n
        \u5982\u679c\u4f60\u8bef\u5220\u4e86\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u4f46\u5c1a\u672a\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528git stash\u547d\u4ee4\u6765\u6062\u590d\u5b83\u4eec\u3002\u5728\u7ec8\u7aef\u4e2d\uff0c\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\u6765\u4fdd\u5b58\u53d8\u66f4\uff1a<\/p>\n
        git stash save \"My changes\"<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u7136\u540e\u53ef\u4ee5\u4f7f\u7528git stash list\u547d\u4ee4\u5217\u51fa\u6240\u6709\u4fdd\u5b58\u7684\u53d8\u66f4\uff0c\u627e\u5230\u4f60\u60f3\u6062\u590d\u7684\u53d8\u66f4\uff0c\u5e76\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5176\u5e94\u7528\u5230\u4f60\u7684\u5206\u652f\u4e0a\uff1a<\/p>\n
        git stash apply stash@{0}<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \n
        1. \u4f7f\u7528git reset\u64a4\u9500\u5220\u9664\u64cd\u4f5c<\/li>\n<\/ol>\n
          \u5982\u679c\u4f60\u8bef\u5220\u4e86\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u5e76\u63d0\u4ea4\u5230\u4e86\u672c\u5730\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u64a4\u9500\u5220\u9664\u64cd\u4f5c\u3002\u5728\u7ec8\u7aef\u4e2d\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
          git reset HEAD^<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \u8fd9\u5c06\u64a4\u9500\u6700\u8fd1\u7684\u63d0\u4ea4\uff0c\u5e76\u4fdd\u7559\u88ab\u5220\u9664\u7684\u6587\u4ef6\u548c\u6587\u4ef6\u5939\u3002\u7136\u540e\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528git checkout\u547d\u4ee4\u6062\u590d\u88ab\u5220\u9664\u7684\u6587\u4ef6\u3002<\/p>\n
            \n
          1. \u4f7f\u7528git reflog\u67e5\u627e\u88ab\u5220\u9664\u7684\u63d0\u4ea4<\/li>\n<\/ol>\n
            \u5982\u679c\u8bef\u5220\u7684\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u5df2\u88ab\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u5e76\u4e14\u4f7f\u7528\u4e86git reset\u547d\u4ee4\u6765\u64a4\u9500\u5220\u9664\u64cd\u4f5c\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528git reflog\u547d\u4ee4\u67e5\u627e\u88ab\u5220\u9664\u7684\u63d0\u4ea4\u3002\u5728\u7ec8\u7aef\u4e2d\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
            git reflog<\/pre>\n
              \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \u8fd9\u5c06\u663e\u793a\u6700\u8fd1\u7684git\u64cd\u4f5c\u8bb0\u5f55\u3002\u4f60\u53ef\u4ee5\u5728\u5217\u8868\u4e2d\u67e5\u627e\u64a4\u9500\u5220\u9664\u64cd\u4f5c\u7684SHA\u503c\uff0c\u7136\u540e\u4f7f\u7528git checkout\u547d\u4ee4\u5c06\u5176\u6062\u590d\u3002<\/p>\n
            \u603b\u7ed3<\/p>\n
            \u5728git\u4e2d\u8bef\u5220\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u662f\u5f88\u5e38\u89c1\u7684\u95ee\u9898\u3002\u65e0\u8bba\u662f\u5728\u8bef\u5220\u524d\u8fd8\u662f\u8bef\u5220\u4e4b\u540e\uff0c\u4f60\u90fd\u53ef\u4ee5\u901a\u8fc7\u5404\u79cd\u547d\u4ee4\u548c\u6280\u5de7\u6765\u6062\u590d\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u6027\u548c\u5b89\u5168\u6027\u3002\u8fd9\u4e9b\u65b9\u6cd5\u4e2d\u6709\u4e9b\u53ef\u4ee5\u5728\u672c\u5730\u4ed3\u5e93\u4f7f\u7528\uff0c\u6709\u4e9b\u53ef\u4ee5\u5728\u8fdc\u7a0b\u4ed3\u5e93\u4f7f\u7528\uff0c\u4f46\u65e0\u8bba\u5982\u4f55\uff0c\u4fdd\u6301\u8c28\u614e\u548c\u8010\u5fc3\uff0c\u4f7f\u7528\u6b63\u786e\u7684\u65b9\u6cd5\uff0c\u603b\u80fd\u627e\u56de\u88ab\u5220\u9664\u7684\u6587\u4ef6\u3002<\/p>\n
            \u4ee5\u4e0a\u5c31\u662f\u4e00\u4e9b\u5904\u7406git\u672c\u5730\u8bef\u5220\u7684\u65b9\u6cd5\u548c\u6280\u5de7\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\u5e7f\u6cdb\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u53ef\u4ee5\u65b9\u4fbf\u5730\u7ba1\u7406\u4ee3\u7801\u53ca\u5176\u5386\u53f2\u8bb0\u5f55\u3002\u7136\u800c\uff0c\u6709\u65f6\u6211\u4eec\u4f1a\u4e0d\u5c0f\u5fc3\u5728\u672c\u5730\u8bef\u5220\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u8fd9\u5bf9\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u6027\u548c\u5b89\u5168\u6027\u90fd\u4f1a\u4ea7\u751f\u5f71\u54cd\u3002\u8fd9\u7bc7\u6587\u7ae0\u5c06\u4ecb\u7ecd\u4e00\u4e9b\u5904\u7406git\u672c\u5730\u8bef\u5220\u7684\u65b9\u6cd5\u548c\u6280\u5de7\u3002 \u4f7f\u7528git\u547d\u4ee4\u6062\u590d\u6587\u4ef6 \u5f53\u6211\u4eec\u5728\u672c\u5730\u8bef\u5220\u4e86\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528git\u547d\u4ee4\u6765\u6062\u590d\u5b83\u4eec\u3002\u9996\u5148\uff0c\u9700\u8981\u77e5\u9053\u5220\u9664\u7684\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u7684\u51c6\u786e\u8def\u5f84\u548c\u540d\u79f0\u3002\u7136\u540e\uff0c\u5728\u7ec8\u7aef\u4e2d\u4f7f\u7528\u4ee5\u4e0bgit\u547d\u4ee4\uff1a git checkout — path\/to\/file \u767b\u5f55\u540e\u590d\u5236 \u5982\u679c\u8981\u6062\u590d\u6574\u4e2a\u6587\u4ef6\u5939\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git checkout — path\/to\/folder\/ \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u6062\u590d\u88ab\u5220\u9664\u7684\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u5e76\u8986\u76d6\u5f53\u524d\u5206\u652f\u4e2d\u7684\u76f8\u5e94\u6587\u4ef6\u3002 \u4f7f\u7528git log\u67e5\u770b\u5386\u53f2\u8bb0\u5f55 \u5982\u679c\u4f60\u4e0d\u786e\u5b9a\u88ab\u8bef\u5220\u7684\u6587\u4ef6\u7684\u8def\u5f84\u548c\u540d\u79f0\uff0c\u53ef\u4ee5\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u6700\u8fd1\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u4e86\u89e3\u54ea\u4e9b\u6587\u4ef6\u88ab\u5220\u9664\u4e86\u3002\u5728\u7ec8\u7aef\u4e2d\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a git log –oneline –diff-filter=D \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u663e\u793a\u6240\u6709\u88ab\u5220\u9664\u7684\u6587\u4ef6\u53ca\u5176\u5220\u9664\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u4f60\u53ef\u4ee5\u590d\u5236\u8be5\u63d0\u4ea4\u8bb0\u5f55\u7684SHA\u503c\uff0c\u7136\u540e\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u6062\u590d\u5b83\uff1a git checkout <commit hash> — path\/to\/file \u767b\u5f55\u540e\u590d\u5236 \u4f7f\u7528git stash\u6062\u590d\u88ab\u8bef\u5220\u7684\u4fee\u6539 \u5982\u679c\u4f60\u8bef\u5220\u4e86\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u4f46\u5c1a\u672a\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528git stash\u547d\u4ee4\u6765\u6062\u590d\u5b83\u4eec\u3002\u5728\u7ec8\u7aef\u4e2d\uff0c\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\u6765\u4fdd\u5b58\u53d8\u66f4\uff1a git stash save “My changes” \u767b\u5f55\u540e\u590d\u5236 \u7136\u540e\u53ef\u4ee5\u4f7f\u7528git stash list\u547d\u4ee4\u5217\u51fa\u6240\u6709\u4fdd\u5b58\u7684\u53d8\u66f4\uff0c\u627e\u5230\u4f60\u60f3\u6062\u590d\u7684\u53d8\u66f4\uff0c\u5e76\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5176\u5e94\u7528\u5230\u4f60\u7684\u5206\u652f\u4e0a\uff1a git stash apply stash@{0} \u767b\u5f55\u540e\u590d\u5236 \u4f7f\u7528git reset\u64a4\u9500\u5220\u9664\u64cd\u4f5c \u5982\u679c\u4f60\u8bef\u5220\u4e86\u6587\u4ef6\u6216\u6587\u4ef6\u5939\u5e76\u63d0\u4ea4\u5230\u4e86\u672c\u5730\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u64a4\u9500\u5220\u9664\u64cd\u4f5c\u3002\u5728\u7ec8\u7aef\u4e2d\u8f93\u5165\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-19555","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19555","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=19555"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19555\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19555"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19555"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19555"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}