{"id":20379,"date":"2024-11-19T15:19:39","date_gmt":"2024-11-19T07:19:39","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20379\/"},"modified":"2024-11-19T15:19:39","modified_gmt":"2024-11-19T07:19:39","slug":"git%e5%a6%82%e4%bd%95%e6%92%a4%e9%94%80%e6%8f%90%e4%ba%a4%e7%9a%84commit","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20379\/","title":{"rendered":"git\u5982\u4f55\u64a4\u9500\u63d0\u4ea4\u7684commit"},"content":{"rendered":"<blockquote><p>\n  git\u64a4\u9500\u63d0\u4ea4\u7684commit\u7684\u65b9\u6cd5\uff1a1\u3001\u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u7684\u5185\u5bb9\uff0c\u5982\u679c\u53d1\u73b0\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u4e2d\u6709\u9519\u8bef\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit commit &#8211;amend\u201d\u547d\u4ee4\u6765\u4fee\u6539\uff1b2\u3001\u64a4\u9500\u67d0\u4e2acommit\u7684\u53d8\u66f4\uff0c\u5982\u679c\u9700\u8981\u5b8c\u5168\u64a4\u9500\u67d0\u4e2acommit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit revert\u201d\u547d\u4ee4\uff1b3\u3001\u5982\u679c\u9700\u8981\u5b8c\u5168\u56de\u9000\u5230\u67d0\u4e2acommit\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit reset\u201d\u547d\u4ee4\u3002\n<\/p><\/blockquote>\n<p><img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/202307\/24\/2023072413294824842.jpg\" class=\"aligncenter\" title=\"git\u5982\u4f55\u64a4\u9500\u63d0\u4ea4\u7684commit\u63d2\u56fe\" alt=\"git\u5982\u4f55\u64a4\u9500\u63d0\u4ea4\u7684commit\u63d2\u56fe\" \/><\/p>\n<p>Git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u5f88\u591a\u529f\u80fd\u5e2e\u52a9\u5f00\u53d1\u4eba\u5458\u6709\u6548\u5730\u7ba1\u7406\u548c\u63a7\u5236\u4ee3\u7801\u7684\u53d8\u66f4\u3002\u5176\u4e2d\u4e00\u4e2a\u91cd\u8981\u7684\u529f\u80fd\u662f\u64a4\u9500\u63d0\u4ea4\u7684commit\u3002\u5f53\u6211\u4eec\u4e0d\u5c0f\u5fc3\u63d0\u4ea4\u4e86\u9519\u8bef\u7684\u4ee3\u7801\u6216\u8005\u9700\u8981\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u65f6\uff0cGit\u63d0\u4f9b\u4e86\u51e0\u79cd\u65b9\u6cd5\u6765\u8fdb\u884c\u64a4\u9500\u64cd\u4f5c\u3002<\/p>\n<p><strong>\u4e00\u3001\u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u7684\u5185\u5bb9<\/strong><\/p>\n<p>\u5982\u679c\u6211\u4eec\u53d1\u73b0\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u4e2d\u6709\u9519\u8bef\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528 commit &#8211;amend\u547d\u4ee4\u6765\u4fee\u6539\u3002<\/p>\n<p>\u6b65\u9aa4\u5982\u4e0b\uff1a<\/p>\n<p>1. \u9996\u5148\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u6700\u8fd1\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u5e76\u627e\u5230\u9700\u8981\u4fee\u6539\u7684commit\u7684\u54c8\u5e0c\u503c\uff0c\u4f8b\u5982&#8221;commit1&#8243;\u3002<\/p>\n<p>2. \u8f93\u5165git rebase -i commit1~1\u6765\u8c03\u7528\u4ea4\u4e92\u5f0f\u7684rebase\u7f16\u8f91\u5668\u3002<\/p>\n<p>3. \u5728\u7f16\u8f91\u5668\u4e2d\u5c06\u9700\u8981\u4fee\u6539\u7684commit\u4fee\u6539\u4e3a&#8221;edit&#8221;\uff0c\u4fdd\u5b58\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002<\/p>\n<p>4. \u4f7f\u7528git commit &#8211;amend\u547d\u4ee4\u5bf9\u6700\u540e\u4e00\u6b21commit\u8fdb\u884c\u4fee\u6539\uff0c\u4f8b\u5982\u4fee\u590d\u9519\u8bef\u7684\u4ee3\u7801\u3002<\/p>\n<p>5. \u4f7f\u7528git rebase &#8211;continue\u547d\u4ee4\u7ee7\u7eedrebase\u64cd\u4f5c\u3002<\/p>\n<p>6. \u6700\u540e\u4f7f\u7528git push\u547d\u4ee4\u5c06\u4fee\u6539\u540e\u7684commit\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n<p>\u8fd9\u4e2a\u65b9\u6cd5\u76f8\u5bf9\u7b80\u5355\uff0c\u4f46\u662f\u9700\u8981\u6ce8\u610f\u7684\u662f\u5bf9\u4e8e\u5df2\u7ecf\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684commit\uff0c\u6211\u4eec\u5e94\u8be5\u8c28\u614e\u4fee\u6539\uff0c\u4ee5\u514d\u5f15\u8d77\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u51b2\u7a81\u3002<\/p>\n<p><strong>\u4e8c\u3001\u64a4\u9500\u67d0\u4e2acommit\u7684\u53d8\u66f4<\/strong><\/p>\n<p>\u5982\u679c\u6211\u4eec\u9700\u8981\u5b8c\u5168\u64a4\u9500\u67d0\u4e2acommit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\uff0c\u53ef\u4ee5\u4f7f\u7528git revert\u547d\u4ee4\u3002<\/p>\n<p>\u6b65\u9aa4\u5982\u4e0b\uff1a<\/p>\n<p>1. \u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u627e\u5230\u9700\u8981\u64a4\u9500\u7684commit\u7684\u54c8\u5e0c\u503c\uff0c\u4f8b\u5982&#8221;commit2&#8243;\u3002<\/p>\n<p>2. \u8f93\u5165git revert commit2\u6765\u64a4\u9500\u8be5commit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\u3002<\/p>\n<p>3. Git\u4f1a\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u65b0\u7684commit\u6765\u8bb0\u5f55\u64a4\u9500\u7684\u66f4\u6539\u3002\u53ef\u4ee5\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u64a4\u9500\u540e\u7684\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n<p>4. \u6700\u540e\u4f7f\u7528git push\u547d\u4ee4\u5c06\u64a4\u9500\u540e\u7684commit\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n<p>\u8fd9\u79cd\u65b9\u6cd5\u662f\u76f8\u5bf9\u5b89\u5168\u7684\uff0c\u56e0\u4e3a\u5b83\u4f1a\u4fdd\u7559\u4e4b\u524d\u7684commit\u8bb0\u5f55\uff0c\u5e76\u4e14\u4e0d\u4f1a\u7834\u574f\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u5e93\u3002<\/p>\n<p><strong>\u4e09\u3001\u56de\u9000\u5230\u4e4b\u524d\u7684commit\u72b6\u6001<\/strong><\/p>\n<p>\u5982\u679c\u6211\u4eec\u9700\u8981\u5b8c\u5168\u56de\u9000\u5230\u67d0\u4e2acommit\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u3002<\/p>\n<p>\u6b65\u9aa4\u5982\u4e0b\uff1a<\/p>\n<p>1. \u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u627e\u5230\u9700\u8981\u56de\u9000\u5230\u7684commit\u7684\u54c8\u5e0c\u503c\uff0c\u4f8b\u5982&#8221;commit3&#8243;\u3002<\/p>\n<p>2. \u8f93\u5165git reset commit3\u6765\u56de\u9000\u5230\u8be5commit\u4e4b\u524d\u7684\u72b6\u6001\u3002<\/p>\n<p>3. Git\u4f1a\u5c06\u5f53\u524d\u5206\u652f\u6307\u9488\u6307\u5411\u5230\u6307\u5b9a\u7684commit\uff0c\u4f46\u662f\u4e4b\u540e\u7684commit\u4f1a\u88ab\u4e22\u5f03\u3002<\/p>\n<p>4. \u6700\u540e\u4f7f\u7528git push -f\u547d\u4ee4\u5c06\u56de\u9000\u540e\u7684\u72b6\u6001\u5f3a\u5236\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n<p>\u9700\u8981\u6ce8\u610f\u7684\u662f\u4f7f\u7528git reset\u547d\u4ee4\u56de\u9000commit\u4f1a\u5bfc\u81f4\u4e4b\u540e\u7684commit\u4e22\u5931\uff0c\u53ef\u80fd\u4f1a\u5bfc\u81f4\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u5e93\u51fa\u73b0\u95ee\u9898\uff0c\u6240\u4ee5\u5728\u4f7f\u7528\u4e4b\u524d\u5e94\u8be5\u4e0e\u56e2\u961f\u6210\u5458\u8fdb\u884c\u6c9f\u901a\u548c\u534f\u8c03\u3002<\/p>\n<p><strong>\u603b\u7ed3\uff1a<\/strong><\/p>\n<p>\u64a4\u9500\u63d0\u4ea4\u7684commit\u662fGit\u4e2d\u5e38\u89c1\u7684\u64cd\u4f5c\u4e4b\u4e00\uff0c\u5728\u9519\u8bef\u7684\u63d0\u4ea4\u6216\u8005\u9700\u8981\u5bf9\u4e4b\u524d\u7684\u4ee3\u7801\u53d8\u66f4\u8fdb\u884c\u4fee\u590d\u7684\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git commit &#8211;amend\u547d\u4ee4\u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u7684\u5185\u5bb9\uff0c\u4f7f\u7528git revert\u547d\u4ee4\u64a4\u9500\u67d0\u4e2acommit\u7684\u53d8\u66f4\uff0c\u6216\u8005\u4f7f\u7528git reset\u547d\u4ee4\u56de\u9000\u5230\u4e4b\u524d\u7684commit\u72b6\u6001\u3002\u6839\u636e\u5177\u4f53\u7684\u60c5\u51b5\u9009\u62e9\u5408\u9002\u7684\u65b9\u6cd5\uff0c\u786e\u4fdd\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u6027\u548c\u7a33\u5b9a\u6027<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u64a4\u9500\u63d0\u4ea4\u7684commit\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":"<p>git\u64a4\u9500\u63d0\u4ea4\u7684commit\u7684\u65b9\u6cd5\uff1a1\u3001\u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u7684\u5185\u5bb9\uff0c\u5982\u679c\u53d1\u73b0\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u4e2d\u6709\u9519\u8bef\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit commit &#8211;amend\u201d\u547d\u4ee4\u6765\u4fee\u6539\uff1b2\u3001\u64a4\u9500\u67d0\u4e2acommit\u7684\u53d8\u66f4\uff0c\u5982\u679c\u9700\u8981\u5b8c\u5168\u64a4\u9500\u67d0\u4e2acommit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit revert\u201d\u547d\u4ee4\uff1b3\u3001\u5982\u679c\u9700\u8981\u5b8c\u5168\u56de\u9000\u5230\u67d0\u4e2acommit\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit reset\u201d\u547d\u4ee4\u3002 Git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u5f88\u591a\u529f\u80fd\u5e2e\u52a9\u5f00\u53d1\u4eba\u5458\u6709\u6548\u5730\u7ba1\u7406\u548c\u63a7\u5236\u4ee3\u7801\u7684\u53d8\u66f4\u3002\u5176\u4e2d\u4e00\u4e2a\u91cd\u8981\u7684\u529f\u80fd\u662f\u64a4\u9500\u63d0\u4ea4\u7684commit\u3002\u5f53\u6211\u4eec\u4e0d\u5c0f\u5fc3\u63d0\u4ea4\u4e86\u9519\u8bef\u7684\u4ee3\u7801\u6216\u8005\u9700\u8981\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u65f6\uff0cGit\u63d0\u4f9b\u4e86\u51e0\u79cd\u65b9\u6cd5\u6765\u8fdb\u884c\u64a4\u9500\u64cd\u4f5c\u3002 \u4e00\u3001\u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u7684\u5185\u5bb9 \u5982\u679c\u6211\u4eec\u53d1\u73b0\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u4e2d\u6709\u9519\u8bef\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528 commit &#8211;amend\u547d\u4ee4\u6765\u4fee\u6539\u3002 \u6b65\u9aa4\u5982\u4e0b\uff1a 1. \u9996\u5148\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u6700\u8fd1\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u5e76\u627e\u5230\u9700\u8981\u4fee\u6539\u7684commit\u7684\u54c8\u5e0c\u503c\uff0c\u4f8b\u5982&#8221;commit1&#8243;\u3002 2. \u8f93\u5165git rebase -i commit1~1\u6765\u8c03\u7528\u4ea4\u4e92\u5f0f\u7684rebase\u7f16\u8f91\u5668\u3002 3. \u5728\u7f16\u8f91\u5668\u4e2d\u5c06\u9700\u8981\u4fee\u6539\u7684commit\u4fee\u6539\u4e3a&#8221;edit&#8221;\uff0c\u4fdd\u5b58\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002 4. \u4f7f\u7528git commit &#8211;amend\u547d\u4ee4\u5bf9\u6700\u540e\u4e00\u6b21commit\u8fdb\u884c\u4fee\u6539\uff0c\u4f8b\u5982\u4fee\u590d\u9519\u8bef\u7684\u4ee3\u7801\u3002 5. \u4f7f\u7528git rebase &#8211;continue\u547d\u4ee4\u7ee7\u7eedrebase\u64cd\u4f5c\u3002 6. \u6700\u540e\u4f7f\u7528git push\u547d\u4ee4\u5c06\u4fee\u6539\u540e\u7684commit\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002 \u8fd9\u4e2a\u65b9\u6cd5\u76f8\u5bf9\u7b80\u5355\uff0c\u4f46\u662f\u9700\u8981\u6ce8\u610f\u7684\u662f\u5bf9\u4e8e\u5df2\u7ecf\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684commit\uff0c\u6211\u4eec\u5e94\u8be5\u8c28\u614e\u4fee\u6539\uff0c\u4ee5\u514d\u5f15\u8d77\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u51b2\u7a81\u3002 \u4e8c\u3001\u64a4\u9500\u67d0\u4e2acommit\u7684\u53d8\u66f4 \u5982\u679c\u6211\u4eec\u9700\u8981\u5b8c\u5168\u64a4\u9500\u67d0\u4e2acommit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\uff0c\u53ef\u4ee5\u4f7f\u7528git revert\u547d\u4ee4\u3002 \u6b65\u9aa4\u5982\u4e0b\uff1a 1. \u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u627e\u5230\u9700\u8981\u64a4\u9500\u7684commit\u7684\u54c8\u5e0c\u503c\uff0c\u4f8b\u5982&#8221;commit2&#8243;\u3002 2. \u8f93\u5165git revert commit2\u6765\u64a4\u9500\u8be5commit\u53ca\u5176\u5bf9\u5e94\u7684\u53d8\u66f4\u3002 3. Git\u4f1a\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u65b0\u7684commit\u6765\u8bb0\u5f55\u64a4\u9500\u7684\u66f4\u6539\u3002\u53ef\u4ee5\u4f7f\u7528git log\u547d\u4ee4\u67e5\u770b\u64a4\u9500\u540e\u7684\u63d0\u4ea4\u5386\u53f2\u3002 4. \u6700\u540e\u4f7f\u7528git push\u547d\u4ee4\u5c06\u64a4\u9500\u540e\u7684commit\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002 \u8fd9\u79cd\u65b9\u6cd5\u662f\u76f8\u5bf9\u5b89\u5168\u7684\uff0c\u56e0\u4e3a\u5b83\u4f1a\u4fdd\u7559\u4e4b\u524d\u7684commit\u8bb0\u5f55\uff0c\u5e76\u4e14\u4e0d\u4f1a\u7834\u574f\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u5e93\u3002 \u4e09\u3001\u56de\u9000\u5230\u4e4b\u524d\u7684commit\u72b6\u6001 \u5982\u679c\u6211\u4eec\u9700\u8981\u5b8c\u5168\u56de\u9000\u5230\u67d0\u4e2acommit\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528git reset\u547d\u4ee4\u3002 \u6b65\u9aa4\u5982\u4e0b\uff1a [&hellip;]<\/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-20379","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20379","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=20379"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20379\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20379"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20379"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20379"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}