{"id":19166,"date":"2024-11-19T16:27:59","date_gmt":"2024-11-19T08:27:59","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19166\/"},"modified":"2024-11-19T16:27:59","modified_gmt":"2024-11-19T08:27:59","slug":"git%e6%80%8e%e4%b9%88%e5%88%a0%e9%99%a4%e6%8f%90%e4%ba%a4%e5%8e%86%e5%8f%b2","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19166\/","title":{"rendered":"git\u600e\u4e48\u5220\u9664\u63d0\u4ea4\u5386\u53f2"},"content":{"rendered":"

\u6807\u9898\uff1agit \u5220\u9664\u63d0\u4ea4\u5386\u53f2\uff1a\u539f\u56e0\u3001\u5fc5\u5907\u77e5\u8bc6\u548c\u64cd\u4f5c\u6b65\u9aa4<\/p>\n

Git \u662f\u4e00\u4e2a\u5e94\u7528\u5e7f\u6cdb\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5f00\u53d1\u8005\u53ef\u4ee5\u901a\u8fc7 Git \u8fdb\u884c\u4ee3\u7801\u7ba1\u7406\u548c\u7248\u672c\u63a7\u5236\u3002Git \u7684\u4e00\u4e2a\u91cd\u8981\u7279\u6027\u662f\u53ef\u4ee5\u56de\u6eda\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\uff0c\u4f46\u6709\u65f6\u6211\u4eec\u9700\u8981\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u3002\u672c\u6587\u5c06\u4ecb\u7ecd Git \u5220\u9664\u63d0\u4ea4\u5386\u53f2\u7684\u539f\u56e0\u3001\u5fc5\u5907\u77e5\u8bc6\u548c\u64cd\u4f5c\u6b65\u9aa4\u3002<\/p>\n

\u4e00\u3001\u4e3a\u4ec0\u4e48\u9700\u8981\u5220\u9664\u63d0\u4ea4\u5386\u53f2<\/p>\n

1.1 \u4fdd\u62a4\u4ee3\u7801\u5b89\u5168\u6027<\/p>\n

\u5982\u679c\u60a8\u4f7f\u7528\u7684\u662f Git \u4f5c\u4e3a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u90a3\u4e48\u5176\u4ed6\u4eba\u90fd\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u5e93\u4e2d\u83b7\u53d6\u5230\u60a8\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u5305\u62ec\u654f\u611f\u7684\u4fe1\u606f\uff0c\u6bd4\u5982\u5bc6\u7801\u3001\u5bc6\u94a5\u7b49\u3002\u901a\u8fc7\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u53ef\u4ee5\u4fdd\u62a4\u4ee3\u7801\u7684\u5b89\u5168\u6027\uff0c\u9632\u6b62\u610f\u5916\u6216\u6076\u610f\u6cc4\u9732\u3002<\/p>\n

1.2 \u6e05\u9664\u5386\u53f2\u8bb0\u5f55<\/p>\n

\u5728\u8fdb\u884c Git \u64cd\u4f5c\u65f6\uff0c\u53ef\u80fd\u4f1a\u6709\u4e00\u4e9b\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\uff0c\u4f8b\u5982\u60a8\u4e0d\u60f3\u5728\u65e5\u5fd7\u4e2d\u663e\u793a\u7684\u63d0\u4ea4\u6216\u8005\u6d4b\u8bd5\u63d0\u4ea4\uff0c\u7b49\u7b49\u3002\u8fd9\u4e9b\u63d0\u4ea4\u53ef\u80fd\u4f1a\u9020\u6210\u6df7\u6dc6\uff0c\u5220\u9664\u5b83\u4eec\u53ef\u4ee5\u6e05\u9664\u5386\u53f2\u8bb0\u5f55\uff0c\u4f7f\u60a8\u7684\u65e5\u5fd7\u66f4\u52a0\u6e05\u6670\u3002<\/p>\n

1.3 \u5408\u5e76\u5206\u652f\u5386\u53f2<\/p>\n

\u5f53\u60a8\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\uff0c\u7136\u540e\u5c06\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u65f6\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u4e00\u4e9b\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u5386\u53f2\u3002\u901a\u8fc7\u5220\u9664\u8fd9\u4e9b\u63d0\u4ea4\u5386\u53f2\uff0c\u53ef\u4ee5\u4f7f\u4e3b\u5206\u652f\u7684\u5386\u53f2\u8bb0\u8f7d\u66f4\u52a0\u5e72\u51c0\u548c\u53ef\u8bfb\u3002<\/p>\n

\u4e8c\u3001\u5fc5\u5907\u77e5\u8bc6<\/p>\n

2.1 \u91cd\u5199\u5386\u53f2<\/p>\n

\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u7684\u65b9\u6cd5\u662f\u901a\u8fc7 Git \u7684\u201c\u91cd\u5199\u5386\u53f2\u201d\u529f\u80fd\u6765\u5b9e\u73b0\u7684\u3002\u5f53\u60a8\u4f7f\u7528\u8fd9\u4e2a\u529f\u80fd\u65f6\uff0cGit \u5c06\u4f1a\u66f4\u6539\u63d0\u4ea4 ID \u548c\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\uff0c\u8fd9\u4f1a\u5f71\u54cd\u5230\u60a8\u548c\u5176\u4ed6\u4eba\u6240\u5173\u6ce8\u7684\u6539\u52a8\u3002\u56e0\u6b64\u5728\u5bf9\u4ee3\u7801\u8fdb\u884c\u4fee\u6539\u65f6\uff0c\u5fc5\u987b\u8981\u5b9e\u65f6\u5907\u4efd\u3002<\/p>\n

2.2 \u5f3a\u5236\u63a8\u9001<\/p>\n

\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u540e\uff0c\u7531\u4e8e\u5386\u53f2\u5df2\u88ab\u66f4\u6539\uff0c\u5f53\u60a8\u5c1d\u8bd5\u5411\u8fdc\u7a0b\u5e93\u63a8\u9001\u66f4\u6539\u65f6\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u201c\u63a8\u9001\u88ab\u62d2\u7edd\u201d\u8fd9\u7c7b\u9519\u8bef\u4fe1\u606f\u3002\u8fd9\u662f\u56e0\u4e3a\u60a8\u7684\u8fdc\u7a0b\u4ee3\u7801\u4ed3\u5e93\u5df2\u7ecf\u5305\u542b\u4e86\u60a8\u5220\u9664\u7684\u63d0\u4ea4\uff0c\u5982\u679c\u60a8\u8981\u63a8\u9001\u6539\u53d8\uff0c\u5fc5\u987b\u4f7f\u7528\u5f3a\u5236\u63a8\u9001\u3002<\/p>\n

\u4e09\u3001\u64cd\u4f5c\u6b65\u9aa4<\/p>\n

\u63a5\u4e0b\u6765\u6211\u4eec\u5c06\u4ecb\u7ecd\u5982\u4f55\u4ece Git \u4e2d\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u3002\u5728\u64cd\u4f5c\u524d\uff0c\u8bf7\u786e\u4fdd\u5df2\u7ecf\u5907\u4efd\u4ee3\u7801\u3002<\/p>\n

3.1 \u4f7f\u7528 git reset \u547d\u4ee4<\/p>\n

\u4f7f\u7528\u547d\u4ee4 git reset –soft HEAD~ \u53ef\u4ee5\u56de\u6eda\u6307\u5b9a\u6570\u91cf\u7684\u63d0\u4ea4\u3002\u5176\u4e2d\u201cnumber\u201d\u4ee3\u8868\u60a8\u60f3\u8981\u56de\u6eda\u7684\u63d0\u4ea4\u6b21\u6570\u3002 <\/p>\n

3.2 \u4f7f\u7528 git push -f \u547d\u4ee4<\/p>\n

\u63a5\u4e0b\u6765\uff0c\u60a8\u9700\u8981\u5c06\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u5e93\u4e2d\u3002\u7531\u4e8e\u5386\u53f2\u5df2\u7ecf\u53d1\u751f\u4e86\u6539\u53d8\uff0c\u56e0\u6b64\u5fc5\u987b\u4f7f\u7528 git push -f \u547d\u4ee4\u6765\u5f3a\u5236\u63a8\u9001\u66f4\u6539\u3002<\/p>\n

4.3 \u4f7f\u7528 git filter-branch \u547d\u4ee4<\/p>\n

\u8fd8\u53ef\u4ee5\u4f7f\u7528\u66f4\u5f3a\u5927\u7684\u547d\u4ee4 git filter-branch \u6765\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u3002\u6b64\u547d\u4ee4\u5141\u8bb8\u60a8\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\u4e2d\u7684\u6240\u6709\u5185\u5bb9\uff0c\u5305\u62ec\u63d0\u4ea4\u6d88\u606f\u3001\u4f5c\u8005\u3001\u65f6\u95f4\u6233\u7b49\u3002\u5b83\u53ef\u4ee5\u5220\u9664\u6307\u5b9a\u7684\u6587\u4ef6\u3001\u6587\u4ef6\u5939\u6216\u67d0\u4e9b\u63d0\u4ea4\u3002<\/p>\n

\u60a8\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u6b64\u547d\u4ee4\u4f1a\u6e05\u9664\u6240\u6709\u9644\u52a0\u6570\u636e\uff0c\u5305\u62ec\u6253\u6807\u7b7e\u7b49\uff0c\u6ce8\u610f\u4fdd\u6301\u5907\u4efd\u3002<\/p>\n

\u603b\u7ed3<\/p>\n

\u5728 Git \u4e2d\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u662f\u4e00\u9879\u975e\u5e38\u9ad8\u7ea7\u7684\u64cd\u4f5c\uff0c\u5b83\u9700\u8981\u5c0f\u5fc3\u8c28\u614e\u548c\u5907\u4efd\u60a8\u7684\u4ee3\u7801\u3002\u5728\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u5728\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e2d\u505a\u597d\u5907\u4efd\uff0c\u4ee5\u9632\u6570\u636e\u4e22\u5931\u3002\u540c\u65f6\uff0c\u8fd8\u9700\u8981\u5728\u56e2\u961f\u4e2d\u5efa\u7acb\u57fa\u672c\u7684\u4ee3\u7801\u5f00\u53d1\u89c4\u8303\u6765\u786e\u4fdd\u4ee3\u7801\u65b9\u4fbf\u7ba1\u7406\uff0c\u540c\u65f6\u63d0\u9ad8\u4ee3\u7801\u8d28\u91cf\u3002\u5e0c\u671b\u8fd9\u7bc7\u6587\u7ae0\u80fd\u591f\u5e2e\u52a9\u60a8\u66f4\u597d\u5730\u4e86\u89e3 Git \u7684\u64cd\u4f5c\u548c\u7ba1\u7406\u3002<\/p>\n

\u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u5220\u9664\u63d0\u4ea4\u5386\u53f2\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":"

\u6807\u9898\uff1agit \u5220\u9664\u63d0\u4ea4\u5386\u53f2\uff1a\u539f\u56e0\u3001\u5fc5\u5907\u77e5\u8bc6\u548c\u64cd\u4f5c\u6b65\u9aa4 Git \u662f\u4e00\u4e2a\u5e94\u7528\u5e7f\u6cdb\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5f00\u53d1\u8005\u53ef\u4ee5\u901a\u8fc7 Git \u8fdb\u884c\u4ee3\u7801\u7ba1\u7406\u548c\u7248\u672c\u63a7\u5236\u3002Git \u7684\u4e00\u4e2a\u91cd\u8981\u7279\u6027\u662f\u53ef\u4ee5\u56de\u6eda\u63d0\u4ea4\u5e76\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\uff0c\u4f46\u6709\u65f6\u6211\u4eec\u9700\u8981\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u3002\u672c\u6587\u5c06\u4ecb\u7ecd Git \u5220\u9664\u63d0\u4ea4\u5386\u53f2\u7684\u539f\u56e0\u3001\u5fc5\u5907\u77e5\u8bc6\u548c\u64cd\u4f5c\u6b65\u9aa4\u3002 \u4e00\u3001\u4e3a\u4ec0\u4e48\u9700\u8981\u5220\u9664\u63d0\u4ea4\u5386\u53f2 1.1 \u4fdd\u62a4\u4ee3\u7801\u5b89\u5168\u6027 \u5982\u679c\u60a8\u4f7f\u7528\u7684\u662f Git \u4f5c\u4e3a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u90a3\u4e48\u5176\u4ed6\u4eba\u90fd\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u5e93\u4e2d\u83b7\u53d6\u5230\u60a8\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u5305\u62ec\u654f\u611f\u7684\u4fe1\u606f\uff0c\u6bd4\u5982\u5bc6\u7801\u3001\u5bc6\u94a5\u7b49\u3002\u901a\u8fc7\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u53ef\u4ee5\u4fdd\u62a4\u4ee3\u7801\u7684\u5b89\u5168\u6027\uff0c\u9632\u6b62\u610f\u5916\u6216\u6076\u610f\u6cc4\u9732\u3002 1.2 \u6e05\u9664\u5386\u53f2\u8bb0\u5f55 \u5728\u8fdb\u884c Git \u64cd\u4f5c\u65f6\uff0c\u53ef\u80fd\u4f1a\u6709\u4e00\u4e9b\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\uff0c\u4f8b\u5982\u60a8\u4e0d\u60f3\u5728\u65e5\u5fd7\u4e2d\u663e\u793a\u7684\u63d0\u4ea4\u6216\u8005\u6d4b\u8bd5\u63d0\u4ea4\uff0c\u7b49\u7b49\u3002\u8fd9\u4e9b\u63d0\u4ea4\u53ef\u80fd\u4f1a\u9020\u6210\u6df7\u6dc6\uff0c\u5220\u9664\u5b83\u4eec\u53ef\u4ee5\u6e05\u9664\u5386\u53f2\u8bb0\u5f55\uff0c\u4f7f\u60a8\u7684\u65e5\u5fd7\u66f4\u52a0\u6e05\u6670\u3002 1.3 \u5408\u5e76\u5206\u652f\u5386\u53f2 \u5f53\u60a8\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\uff0c\u7136\u540e\u5c06\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u65f6\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u4e00\u4e9b\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u5386\u53f2\u3002\u901a\u8fc7\u5220\u9664\u8fd9\u4e9b\u63d0\u4ea4\u5386\u53f2\uff0c\u53ef\u4ee5\u4f7f\u4e3b\u5206\u652f\u7684\u5386\u53f2\u8bb0\u8f7d\u66f4\u52a0\u5e72\u51c0\u548c\u53ef\u8bfb\u3002 \u4e8c\u3001\u5fc5\u5907\u77e5\u8bc6 2.1 \u91cd\u5199\u5386\u53f2 \u5220\u9664\u63d0\u4ea4\u5386\u53f2\u7684\u65b9\u6cd5\u662f\u901a\u8fc7 Git \u7684\u201c\u91cd\u5199\u5386\u53f2\u201d\u529f\u80fd\u6765\u5b9e\u73b0\u7684\u3002\u5f53\u60a8\u4f7f\u7528\u8fd9\u4e2a\u529f\u80fd\u65f6\uff0cGit \u5c06\u4f1a\u66f4\u6539\u63d0\u4ea4 ID \u548c\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\uff0c\u8fd9\u4f1a\u5f71\u54cd\u5230\u60a8\u548c\u5176\u4ed6\u4eba\u6240\u5173\u6ce8\u7684\u6539\u52a8\u3002\u56e0\u6b64\u5728\u5bf9\u4ee3\u7801\u8fdb\u884c\u4fee\u6539\u65f6\uff0c\u5fc5\u987b\u8981\u5b9e\u65f6\u5907\u4efd\u3002 2.2 \u5f3a\u5236\u63a8\u9001 \u5220\u9664\u63d0\u4ea4\u5386\u53f2\u540e\uff0c\u7531\u4e8e\u5386\u53f2\u5df2\u88ab\u66f4\u6539\uff0c\u5f53\u60a8\u5c1d\u8bd5\u5411\u8fdc\u7a0b\u5e93\u63a8\u9001\u66f4\u6539\u65f6\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u201c\u63a8\u9001\u88ab\u62d2\u7edd\u201d\u8fd9\u7c7b\u9519\u8bef\u4fe1\u606f\u3002\u8fd9\u662f\u56e0\u4e3a\u60a8\u7684\u8fdc\u7a0b\u4ee3\u7801\u4ed3\u5e93\u5df2\u7ecf\u5305\u542b\u4e86\u60a8\u5220\u9664\u7684\u63d0\u4ea4\uff0c\u5982\u679c\u60a8\u8981\u63a8\u9001\u6539\u53d8\uff0c\u5fc5\u987b\u4f7f\u7528\u5f3a\u5236\u63a8\u9001\u3002 \u4e09\u3001\u64cd\u4f5c\u6b65\u9aa4 \u63a5\u4e0b\u6765\u6211\u4eec\u5c06\u4ecb\u7ecd\u5982\u4f55\u4ece Git \u4e2d\u5220\u9664\u63d0\u4ea4\u5386\u53f2\u3002\u5728\u64cd\u4f5c\u524d\uff0c\u8bf7\u786e\u4fdd\u5df2\u7ecf\u5907\u4efd\u4ee3\u7801\u3002 3.1 \u4f7f\u7528 git reset \u547d\u4ee4 \u4f7f\u7528\u547d\u4ee4 git reset –soft HEAD~ \u53ef\u4ee5\u56de\u6eda\u6307\u5b9a\u6570\u91cf\u7684\u63d0\u4ea4\u3002\u5176\u4e2d\u201cnumber\u201d\u4ee3\u8868\u60a8\u60f3\u8981\u56de\u6eda\u7684\u63d0\u4ea4\u6b21\u6570\u3002 3.2 \u4f7f\u7528 git push -f […]<\/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-19166","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19166","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=19166"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19166\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19166"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19166"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19166"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}