{"id":19568,"date":"2024-11-19T08:55:00","date_gmt":"2024-11-19T00:55:00","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19568\/"},"modified":"2024-11-19T08:55:00","modified_gmt":"2024-11-19T00:55:00","slug":"%e8%af%a6%e8%a7%a3%e4%bb%8b%e7%bb%8d%e5%88%a0%e9%99%a4git%e5%8e%86%e5%8f%b2%e7%9a%84%e4%b8%8d%e5%90%8c%e6%96%b9%e6%b3%95","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19568\/","title":{"rendered":"\u8be6\u89e3\u4ecb\u7ecd\u5220\u9664Git\u5386\u53f2\u7684\u4e0d\u540c\u65b9\u6cd5"},"content":{"rendered":"

git\u662f\u4e00\u4e2a\u975e\u5e38\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u5f88\u591a\u65b9\u4fbf\u7684\u547d\u4ee4\u548c\u529f\u80fd\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u5404\u4e2a\u7248\u672c\u3002\u5176\u4e2d\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684\u529f\u80fd\u662f\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u80fd\u529b\u3002git\u5141\u8bb8\u4f60\u5220\u9664\u67d0\u4e2a\u7279\u5b9a\u7684commit\uff0c\u5b83\u8fd8\u6709\u4e00\u4e9b\u9ad8\u7ea7\u7684\u9009\u9879\u6765\u6e05\u7406\u5386\u53f2\u8bb0\u5f55\u5e76\u4fdd\u6301\u4f60\u7684\u4ee3\u7801\u5e93\u5e72\u51c0\u6574\u6d01\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5220\u9664git\u5386\u53f2\u7684\u4e0d\u540c\u65b9\u6cd5\u4ee5\u53ca\u5b83\u4eec\u7684\u4f18\u7f3a\u70b9\u3002<\/p>\n

    \n
  1. \u5220\u9664\u67d0\u4e2acommit<\/li>\n<\/ol>\n

    \u5982\u679c\u4f60\u60f3\u8981\u5220\u9664Git\u5386\u53f2\u4e2d\u7684\u67d0\u4e2a\u7279\u5b9acommit\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n

    git rebase -i <commit><\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u5176\u4e2d  \u662f\u4f60\u60f3\u8981\u4ece\u4e2d\u5220\u9664\u7684\u6700\u8fd1\u7684commit\u7684\u54c8\u5e0c\u503c\u3002\u8fd9\u6761\u547d\u4ee4\u5c06\u542f\u52a8\u4ea4\u4e92\u5f0frebase\uff0c\u4f60\u53ef\u4ee5\u5728\u5176\u4e2d\u7f16\u8f91\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u5982\u679c\u4f60\u60f3\u8981\u5220\u9664\u4e00\u4e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u5c06\u5176\u66f4\u6539\u4e3adrop\u3002\u5982\u679c\u4f60\u66f4\u6539\u4e86\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\uff0cGit\u5c06\u91cd\u65b0\u5e94\u7528\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4ee5\u521b\u5efa\u65b0\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u8bf7\u6ce8\u610f\uff0c\u66f4\u6539\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u53ef\u80fd\u4f1a\u7834\u574fGit\u5386\u53f2\uff0c\u56e0\u6b64\u8bf7\u8c28\u614e\u4f7f\u7528\u6b64\u529f\u80fd\u3002 <\/p>\n
      \n
    1. \u5220\u9664\u67d0\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u8bb0\u5f55<\/li>\n<\/ol>\n
      \u6709\u65f6\u4f60\u53ef\u80fd\u9700\u8981\u4eceGit\u5386\u53f2\u8bb0\u5f55\u4e2d\u5220\u9664\u67d0\u4e2a\u6587\u4ef6\u7684\u6240\u6709\u5386\u53f2\u8bb0\u5f55\u3002\u8fd9\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5b8c\u6210\uff1a<\/p>\n
      git filter-branch --tree-filter 'rm -rf path\/to\/file' -- --all<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u5176\u4e2dpath\/to\/file\u662f\u4f60\u60f3\u8981\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u6587\u4ef6\u7684\u8def\u5f84\u3002\u6b64\u547d\u4ee4\u5c06\u590d\u5236\u6bcf\u4e2a\u63d0\u4ea4\uff0c\u5e76\u5728\u6bcf\u4e2a\u63d0\u4ea4\u4e0a\u8fd0\u884c\u7ed9\u5b9a\u7684\u547d\u4ee4\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u7ed9\u5b9a\u7684\u547d\u4ee4\u662f\u5220\u9664\u6307\u5b9a\u7684\u6587\u4ef6\u3002\u8bf7\u6ce8\u610f\uff0c\u8fd9\u4e2a\u64cd\u4f5c\u53ef\u80fd\u4f1a\u975e\u5e38\u8017\u65f6\uff0c\u56e0\u4e3a\u5b83\u9700\u8981\u91cd\u65b0\u5199\u5165\u6574\u4e2aGit\u5386\u53f2\u3002\u5728\u64cd\u4f5c\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u5907\u4efd\u6240\u6709\u6570\u636e\u5e76\u4ed4\u7ec6\u9605\u8bfb\u6587\u6863\u3002<\/p>\n
        \n
      1. \u5229\u7528Git reset<\/li>\n<\/ol>\n
        \u4f60\u8fd8\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u6765\u64a4\u9500\u63d0\u4ea4\u5e76\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u3002\u8fd9\u4e2a\u547d\u4ee4\u7684\u57fa\u672c\u8bed\u6cd5\u662f\uff1a<\/p>\n
        git reset --hard <commit><\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5728\u8fd9\u91cc\uff0c  \u662f\u4f60\u60f3\u8981\u56de\u6eda\u5230\u7684\u7279\u5b9a\u7684\u63d0\u4ea4\u3002\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06HEAD\u79fb\u52a8\u5230\u7ed9\u5b9a\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u5de5\u4f5c\u6811\u72b6\u6001\u91cd\u7f6e\u4e3a\u8be5\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u56e0\u6b64\uff0c\u5b83\u4f1a\u4e22\u5931\u6240\u6709\u4ee5\u8be5\u63d0\u4ea4\u4e4b\u540e\u7684\u63d0\u4ea4\u3002 <\/p>\n
          \n
        1. \u5229\u7528Git revert<\/li>\n<\/ol>\n
          git revert\u547d\u4ee4\u5141\u8bb8\u4f60\u64a4\u9500\u67d0\u4e2a\u63d0\u4ea4\uff0c\u4f46\u4fdd\u7559\u5176\u5386\u53f2\u8bb0\u5f55\u3002\u5b83\u7684\u57fa\u672c\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n
          git revert <commit><\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \u8fd9\u5c06\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u4ee5\u201c\u64a4\u9500\u201d\u7ed9\u5b9a\u63d0\u4ea4\u7684\u66f4\u6539\u3002\u8fd9\u4e2a\u64cd\u4f5c\u4e0d\u4f1a\u6539\u53d8\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u4e14\u5b83\u66f4\u5b89\u5168\uff0c\u56e0\u4e3a\u5b83\u4e0d\u4f1a\u5b8c\u5168\u5220\u9664\u63d0\u4ea4\u3002\u7136\u800c\uff0c\u5b83\u4e5f\u4f1a\u589e\u52a0\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u7684\u6df7\u4e71\u548c\u590d\u6742\u6027\u3002<\/p>\n
          \u603b\u7ed3<\/p>\n
          \u5220\u9664Git\u5386\u53f2\u8bb0\u5f55\u7684\u80fd\u529b\u5f88\u6709\u7528\uff0c\u4f46\u4e5f\u9700\u8981\u975e\u5e38\u4ed4\u7ec6\u5730\u4f7f\u7528\u3002\u5728\u51b3\u5b9a\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u5907\u4efd\u6240\u6709\u6570\u636e\uff0c\u4ee5\u9632\u6b62\u4e0d\u53ef\u6062\u590d\u7684\u6570\u636e\u4e22\u5931\u3002\u6b64\u5916\uff0c\u8bf7\u8bb0\u4f4f\uff0c\u66f4\u6539Git\u5386\u53f2\u8bb0\u5f55\u53ef\u80fd\u4f1a\u5bf9\u5176\u4ed6\u56e2\u961f\u6210\u5458\u4ea7\u751f\u5f71\u54cd\uff0c\u56e0\u6b64\u8bf7\u5728\u5220\u9664\u6216\u66f4\u6539\u5386\u53f2\u8bb0\u5f55\u4e4b\u524d\u4e0e\u4ed6\u4eec\u8fdb\u884c\u8ba8\u8bba\u3002\u6700\u540e\uff0c\u6839\u636e\u4f60\u7684\u5177\u4f53\u9700\u6c42\u548c\u60c5\u51b5\u9009\u62e9\u6700\u5408\u9002\u7684\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u65b9\u6cd5\u3002<\/p>\n
          \u4ee5\u4e0a\u5c31\u662f\u8be6\u89e3\u4ecb\u7ecd\u5220\u9664Git\u5386\u53f2\u7684\u4e0d\u540c\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":"
          git\u662f\u4e00\u4e2a\u975e\u5e38\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u5f88\u591a\u65b9\u4fbf\u7684\u547d\u4ee4\u548c\u529f\u80fd\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u5404\u4e2a\u7248\u672c\u3002\u5176\u4e2d\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684\u529f\u80fd\u662f\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u80fd\u529b\u3002git\u5141\u8bb8\u4f60\u5220\u9664\u67d0\u4e2a\u7279\u5b9a\u7684commit\uff0c\u5b83\u8fd8\u6709\u4e00\u4e9b\u9ad8\u7ea7\u7684\u9009\u9879\u6765\u6e05\u7406\u5386\u53f2\u8bb0\u5f55\u5e76\u4fdd\u6301\u4f60\u7684\u4ee3\u7801\u5e93\u5e72\u51c0\u6574\u6d01\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5220\u9664git\u5386\u53f2\u7684\u4e0d\u540c\u65b9\u6cd5\u4ee5\u53ca\u5b83\u4eec\u7684\u4f18\u7f3a\u70b9\u3002 \u5220\u9664\u67d0\u4e2acommit \u5982\u679c\u4f60\u60f3\u8981\u5220\u9664Git\u5386\u53f2\u4e2d\u7684\u67d0\u4e2a\u7279\u5b9acommit\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git rebase -i <commit> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u4f60\u60f3\u8981\u4ece\u4e2d\u5220\u9664\u7684\u6700\u8fd1\u7684commit\u7684\u54c8\u5e0c\u503c\u3002\u8fd9\u6761\u547d\u4ee4\u5c06\u542f\u52a8\u4ea4\u4e92\u5f0frebase\uff0c\u4f60\u53ef\u4ee5\u5728\u5176\u4e2d\u7f16\u8f91\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u5982\u679c\u4f60\u60f3\u8981\u5220\u9664\u4e00\u4e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u5c06\u5176\u66f4\u6539\u4e3adrop\u3002\u5982\u679c\u4f60\u66f4\u6539\u4e86\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\uff0cGit\u5c06\u91cd\u65b0\u5e94\u7528\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4ee5\u521b\u5efa\u65b0\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u8bf7\u6ce8\u610f\uff0c\u66f4\u6539\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u53ef\u80fd\u4f1a\u7834\u574fGit\u5386\u53f2\uff0c\u56e0\u6b64\u8bf7\u8c28\u614e\u4f7f\u7528\u6b64\u529f\u80fd\u3002 \u5220\u9664\u67d0\u4e2a\u6587\u4ef6\u7684\u5386\u53f2\u8bb0\u5f55 \u6709\u65f6\u4f60\u53ef\u80fd\u9700\u8981\u4eceGit\u5386\u53f2\u8bb0\u5f55\u4e2d\u5220\u9664\u67d0\u4e2a\u6587\u4ef6\u7684\u6240\u6709\u5386\u53f2\u8bb0\u5f55\u3002\u8fd9\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5b8c\u6210\uff1a git filter-branch –tree-filter ‘rm -rf path\/to\/file’ — –all \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2dpath\/to\/file\u662f\u4f60\u60f3\u8981\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u6587\u4ef6\u7684\u8def\u5f84\u3002\u6b64\u547d\u4ee4\u5c06\u590d\u5236\u6bcf\u4e2a\u63d0\u4ea4\uff0c\u5e76\u5728\u6bcf\u4e2a\u63d0\u4ea4\u4e0a\u8fd0\u884c\u7ed9\u5b9a\u7684\u547d\u4ee4\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u7ed9\u5b9a\u7684\u547d\u4ee4\u662f\u5220\u9664\u6307\u5b9a\u7684\u6587\u4ef6\u3002\u8bf7\u6ce8\u610f\uff0c\u8fd9\u4e2a\u64cd\u4f5c\u53ef\u80fd\u4f1a\u975e\u5e38\u8017\u65f6\uff0c\u56e0\u4e3a\u5b83\u9700\u8981\u91cd\u65b0\u5199\u5165\u6574\u4e2aGit\u5386\u53f2\u3002\u5728\u64cd\u4f5c\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u5907\u4efd\u6240\u6709\u6570\u636e\u5e76\u4ed4\u7ec6\u9605\u8bfb\u6587\u6863\u3002 \u5229\u7528Git reset \u4f60\u8fd8\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u6765\u64a4\u9500\u63d0\u4ea4\u5e76\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u3002\u8fd9\u4e2a\u547d\u4ee4\u7684\u57fa\u672c\u8bed\u6cd5\u662f\uff1a git reset –hard <commit> \u767b\u5f55\u540e\u590d\u5236 \u5728\u8fd9\u91cc\uff0c \u662f\u4f60\u60f3\u8981\u56de\u6eda\u5230\u7684\u7279\u5b9a\u7684\u63d0\u4ea4\u3002\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06HEAD\u79fb\u52a8\u5230\u7ed9\u5b9a\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u5de5\u4f5c\u6811\u72b6\u6001\u91cd\u7f6e\u4e3a\u8be5\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u56e0\u6b64\uff0c\u5b83\u4f1a\u4e22\u5931\u6240\u6709\u4ee5\u8be5\u63d0\u4ea4\u4e4b\u540e\u7684\u63d0\u4ea4\u3002 \u5229\u7528Git revert git revert\u547d\u4ee4\u5141\u8bb8\u4f60\u64a4\u9500\u67d0\u4e2a\u63d0\u4ea4\uff0c\u4f46\u4fdd\u7559\u5176\u5386\u53f2\u8bb0\u5f55\u3002\u5b83\u7684\u57fa\u672c\u8bed\u6cd5\u5982\u4e0b\uff1a git revert <commit> \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u4ee5\u201c\u64a4\u9500\u201d\u7ed9\u5b9a\u63d0\u4ea4\u7684\u66f4\u6539\u3002\u8fd9\u4e2a\u64cd\u4f5c\u4e0d\u4f1a\u6539\u53d8\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u4e14\u5b83\u66f4\u5b89\u5168\uff0c\u56e0\u4e3a\u5b83\u4e0d\u4f1a\u5b8c\u5168\u5220\u9664\u63d0\u4ea4\u3002\u7136\u800c\uff0c\u5b83\u4e5f\u4f1a\u589e\u52a0\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u7684\u6df7\u4e71\u548c\u590d\u6742\u6027\u3002 \u603b\u7ed3 \u5220\u9664Git\u5386\u53f2\u8bb0\u5f55\u7684\u80fd\u529b\u5f88\u6709\u7528\uff0c\u4f46\u4e5f\u9700\u8981\u975e\u5e38\u4ed4\u7ec6\u5730\u4f7f\u7528\u3002\u5728\u51b3\u5b9a\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u5907\u4efd\u6240\u6709\u6570\u636e\uff0c\u4ee5\u9632\u6b62\u4e0d\u53ef\u6062\u590d\u7684\u6570\u636e\u4e22\u5931\u3002\u6b64\u5916\uff0c\u8bf7\u8bb0\u4f4f\uff0c\u66f4\u6539Git\u5386\u53f2\u8bb0\u5f55\u53ef\u80fd\u4f1a\u5bf9\u5176\u4ed6\u56e2\u961f\u6210\u5458\u4ea7\u751f\u5f71\u54cd\uff0c\u56e0\u6b64\u8bf7\u5728\u5220\u9664\u6216\u66f4\u6539\u5386\u53f2\u8bb0\u5f55\u4e4b\u524d\u4e0e\u4ed6\u4eec\u8fdb\u884c\u8ba8\u8bba\u3002\u6700\u540e\uff0c\u6839\u636e\u4f60\u7684\u5177\u4f53\u9700\u6c42\u548c\u60c5\u51b5\u9009\u62e9\u6700\u5408\u9002\u7684\u5220\u9664\u5386\u53f2\u8bb0\u5f55\u7684\u65b9\u6cd5\u3002 \u4ee5\u4e0a\u5c31\u662f\u8be6\u89e3\u4ecb\u7ecd\u5220\u9664Git\u5386\u53f2\u7684\u4e0d\u540c\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},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-19568","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19568","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=19568"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19568\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19568"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19568"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19568"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}