{"id":340,"date":"2024-12-27T15:18:53","date_gmt":"2024-12-27T07:18:53","guid":{"rendered":"http:\/\/106.12.148.75\/?p=340"},"modified":"2025-01-24T21:11:26","modified_gmt":"2025-01-24T13:11:26","slug":"%e3%80%90git%e3%80%91git%e6%8f%90%e4%ba%a4%e9%94%99%e4%ba%86%e6%80%8e%e4%b9%88%e5%8a%9e%ef%bc%9f","status":"publish","type":"post","link":"https:\/\/jamilblog.top\/?p=340","title":{"rendered":"\u3010Git\u3011git\u63d0\u4ea4\u9519\u4e86\u600e\u4e48\u529e\uff1f"},"content":{"rendered":"\n

\u5982\u4f55\u5728Git\u4e2d\u5904\u7406\u4e0d\u540c\u9636\u6bb5\u7684\u9519\u8bef<\/h2>\n\n\n\n

\u5728\u65e5\u5e38\u7684\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u96be\u514d\u4f1a\u5728\u4ee3\u7801\u7ba1\u7406\u5de5\u5177Git\u4e2d\u72af\u9519\u3002\u7406\u89e3\u5982\u4f55\u5728\u4e0d\u540c\u9636\u6bb5\u5904\u7406\u8fd9\u4e9b\u9519\u8bef\uff0c\u4e0d\u4ec5\u53ef\u4ee5\u63d0\u9ad8\u5de5\u4f5c\u6548\u7387\uff0c\u8fd8\u80fd\u786e\u4fdd\u4ee3\u7801\u5e93\u7684\u6574\u6d01\u4e0e\u7a33\u5b9a\u3002\u672c\u6587\u5c06\u8be6\u7ec6\u4ecb\u7ecd\u5728\u4ee5\u4e0b\u4e09\u79cd\u60c5\u51b5\u4e0b\u5982\u4f55\u5904\u7406\u9519\u8bef\uff1a<\/p>\n\n\n\n

\u4e00\u3001\u9519\u8bef\u5df2\u7ecfcommit\u5e76push\u5230\u8fdc\u7aef<\/h2>\n\n\n\n

\u5f53\u9519\u8bef\u7684\u63d0\u4ea4\u5df2\u7ecf\u88ab\u63a8\u9001\u5230\u8fdc\u7aef\u4ed3\u5e93\u65f6\uff0c\u5904\u7406\u8d77\u6765\u76f8\u5bf9\u590d\u6742\uff0c\u56e0\u4e3a\u8fd9\u6d89\u53ca\u5230\u56e2\u961f\u534f\u4f5c\u548c\u4ee3\u7801\u5e93\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u4ee5\u4e0b\u662f\u51e0\u79cd\u5e38\u89c1\u7684\u5904\u7406\u65b9\u6cd5\uff1a<\/p>\n\n\n\n

1.1 \u4f7f\u7528git revert\u64a4\u9500\u9519\u8bef\u63d0\u4ea4<\/h3>\n\n\n\n

git revert\u547d\u4ee4\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u64a4\u9500\u6307\u5b9a\u7684\u9519\u8bef\u63d0\u4ea4\u3002\u8fd9\u79cd\u65b9\u6cd5\u4e0d\u4f1a\u4fee\u6539\u4ed3\u5e93\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u9002\u5408\u5df2\u7ecf\u63a8\u9001\u5230\u8fdc\u7aef\u4e14\u88ab\u5176\u4ed6\u4eba\u62c9\u53d6\u7684\u60c5\u51b5\u3002<\/p>\n\n\n\n

\u6b65\u9aa4\uff1a<\/strong><\/p>\n\n\n\n

\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u627e\u5230\u9700\u8981\u64a4\u9500\u7684\u63d0\u4ea4ID\uff08SHA\uff09<\/p>\n\n\n\n

ShellScript<\/span><\/path><\/path><\/svg><\/span>
git<\/span> <\/span>log<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
\u4f7f\u7528git revert\u64a4\u9500\u6307\u5b9a\u7684\u63d0\u4ea4<\/p>\n\n\n\n
ShellScript<\/span><\/path><\/path><\/svg><\/span>
git<\/span> <\/span>revert<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span> <\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
\u63a8\u9001\u64a4\u9500\u540e\u7684\u63d0\u4ea4\u5230\u8fdc\u7aef<\/p>\n\n\n\n
ShellScript<\/span><\/path><\/path><\/svg><\/span>
git<\/span> <\/span>push<\/span> <\/span>origin<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
1.2 \u5f3a\u5236\u56de\u9000\uff08\u4e0d\u63a8\u8350\uff0c\u9700\u8c28\u614e\u4f7f\u7528\uff09<\/h3>\n\n\n\n
\u5982\u679c\u786e\u5b9e\u9700\u8981\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u7ed3\u5408--hard\u53c2\u6570\uff0c\u7136\u540e\u5f3a\u5236\u63a8\u9001\u3002\u4f46\u662f\uff0c\u8fd9\u79cd\u65b9\u6cd5\u4f1a\u91cd\u5199\u5386\u53f2\uff0c\u53ef\u80fd\u5bfc\u81f4\u56e2\u961f\u6210\u5458\u7684\u4ed3\u5e93\u51fa\u73b0\u95ee\u9898\uff0c\u56e0\u6b64\u4e0d\u63a8\u8350\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\u4f7f\u7528\uff0c\u9664\u975e\u7ecf\u8fc7\u5145\u5206\u6c9f\u901a\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\uff1a<\/strong><\/p>\n\n\n\n
# \u56de\u9000\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\uff08\u4e0d\u4fdd\u7559\u540e\u7eed\u66f4\u6539\uff09<\/p>\n\n\n\n
ShellScript<\/span><\/path><\/path><\/svg><\/span>
git<\/span> <\/span>reset<\/span> <\/span>--hard<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span><\/span>\n# \u5f3a\u5236\u63a8\u9001\u5230\u8fdc\u7aef<\/span><\/span>\ngit<\/span> <\/span>push<\/span> <\/span>origin<\/span> <\/span><<\/span>branch-nam<\/span>e<\/span>><\/span> <\/span>--force<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
\u6ce8\u610f\u4e8b\u9879\uff1a<\/strong><\/p>\n\n\n\n
    \n
  • \u786e\u4fdd\u6240\u6709\u56e2\u961f\u6210\u5458\u4e86\u89e3\u6b64\u64cd\u4f5c\uff0c\u4ee5\u907f\u514d\u4ee3\u7801\u51b2\u7a81\u548c\u6570\u636e\u4e22\u5931\u3002<\/li>\n\n\n\n
  • \u5907\u4efd\u5f53\u524d\u5206\u652f\uff0c\u4ee5\u9632\u64cd\u4f5c\u5931\u8bef\u3002<\/li>\n<\/ul>\n\n\n\n
    1.3 \u4f7f\u7528git reflog\u6062\u590d<\/h3>\n\n\n\n
    \u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u53ef\u4ee5\u901a\u8fc7git reflog\u627e\u5230\u4e4b\u524d\u7684\u72b6\u6001\u5e76\u6062\u590d\u3002\u4e0d\u8fc7\uff0c\u8fd9\u540c\u6837\u9700\u8981\u8c28\u614e\u64cd\u4f5c\uff0c\u907f\u514d\u5f71\u54cd\u56e2\u961f\u534f\u4f5c\u3002<\/p>\n\n\n\n
    \u6b65\u9aa4\uff1a<\/strong><\/p>\n\n\n\n
    ShellScript<\/span><\/path><\/path><\/svg><\/span>
    # \u67e5\u770breflog\uff0c\u627e\u5230\u9700\u8981\u6062\u590d\u7684\u63d0\u4ea4<\/span><\/span>\ngit<\/span> <\/span>reflog<\/span><\/span>\n<\/span>\n# \u91cd\u7f6e\u5230\u6307\u5b9a\u7684\u63d0\u4ea4<\/span><\/span>\ngit<\/span> <\/span>reset<\/span> <\/span>--hard<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span><\/span>\n<\/span>\n# \u5f3a\u5236\u63a8\u9001\u5230\u8fdc\u7aef<\/span><\/span>\ngit<\/span> <\/span>push<\/span> <\/span>origin<\/span> <\/span><<\/span>branch-nam<\/span>e<\/span>><\/span> <\/span>--force<\/span><\/span>\n<\/span><\/code><\/pre><\/div>\n\n\n\n
    \u4e8c\u3001\u9519\u8bef\u5df2commit\u4f46\u8fd8\u6ca1push\u5230\u8fdc\u7aef<\/h2>\n\n\n\n
    \u5f53\u9519\u8bef\u7684\u63d0\u4ea4\u5df2\u7ecf\u5b58\u5728\u4e8e\u672c\u5730\u4ed3\u5e93\uff0c\u4f46\u5c1a\u672a\u63a8\u9001\u5230\u8fdc\u7aef\u65f6\uff0c\u5904\u7406\u76f8\u5bf9\u7b80\u5355\uff0c\u53ef\u4ee5\u76f4\u63a5\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n\n\n\n
    2.1 \u4f7f\u7528git commit --amend\u4fee\u6539\u6700\u65b0\u7684\u63d0\u4ea4<\/h3>\n\n\n\n
    \u5982\u679c\u9519\u8bef\u51fa\u73b0\u5728\u6700\u65b0\u7684\u4e00\u6b21\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528--amend\u9009\u9879\u4fee\u6539\u63d0\u4ea4\u5185\u5bb9\u6216\u63d0\u4ea4\u4fe1\u606f\u3002<\/p>\n\n\n\n
    \u6b65\u9aa4\uff1a<\/strong><\/p>\n\n\n\n
    ShellScript<\/span><\/path><\/path><\/svg><\/span>
    # \u4fee\u6539\u6587\u4ef6\u5185\u5bb9\u540e\uff0c\u91cd\u65b0\u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/span><\/span>\ngit<\/span> <\/span>add<\/span> <\/span><<\/span>fil<\/span>e<\/span>><\/span><\/span>\n<\/span>\n# \u4f7f\u7528--amend\u4fee\u6539\u6700\u540e\u4e00\u6b21\u63d0\u4ea4<\/span><\/span>\ngit<\/span> <\/span>commit<\/span> <\/span>--amend<\/span><\/span>\n<\/span>\n# \u5982\u679c\u53ea\u9700\u8981\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/span><\/span>\ngit<\/span> <\/span>commit<\/span> <\/span>--amend<\/span> <\/span>-m<\/span> <\/span>"<\/span>\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f<\/span>"<\/span><\/span>\n<\/span><\/code><\/pre><\/div>\n\n\n\n
    2.2 \u4f7f\u7528git reset\u56de\u9000\u5230\u4e4b\u524d\u7684\u72b6\u6001<\/h3>\n\n\n\n
    \u5982\u679c\u9700\u8981\u64a4\u9500\u591a\u4e2a\u63d0\u4ea4\u6216\u56de\u9000\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u3002<\/p>\n\n\n\n
    \u6b65\u9aa4\uff1a<\/strong><\/p>\n\n\n\n
    ShellScript<\/span><\/path><\/path><\/svg><\/span>
    # \u67e5\u770b\u63d0\u4ea4\u5386\u53f2<\/span><\/span>\ngit<\/span> <\/span>log<\/span><\/span>\n<\/span>\n# \u8f6f\u56de\u9000\uff0c\u4fdd\u7559\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u66f4\u6539<\/span><\/span>\ngit<\/span> <\/span>reset<\/span> <\/span>--soft<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span><\/span>\n<\/span>\n# \u6df7\u5408\u56de\u9000\uff0c\u4fdd\u7559\u5de5\u4f5c\u533a\u7684\u66f4\u6539\u4f46\u6e05\u7a7a\u6682\u5b58\u533a<\/span><\/span>\ngit<\/span> <\/span>reset<\/span> <\/span>--mixed<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span><\/span>\n<\/span>\n# \u786c\u56de\u9000\uff0c\u6e05\u7a7a\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u66f4\u6539<\/span><\/span>\ngit<\/span> <\/span>reset<\/span> <\/span>--hard<\/span> <\/span><<\/span>commit-i<\/span>d<\/span>><\/span><\/span>\n<\/span><\/code><\/pre><\/div>\n\n\n\n
    \u6ce8\u610f\u4e8b\u9879\uff1a<\/strong><\/p>\n\n\n\n