{"id":21637,"date":"2024-11-19T15:26:49","date_gmt":"2024-11-19T07:26:49","guid":{"rendered":"https:\/\/fwq.ai\/blog\/21637\/"},"modified":"2024-11-19T15:26:49","modified_gmt":"2024-11-19T07:26:49","slug":"%e6%80%8e%e4%b9%88%e6%8a%8agit%e7%9a%84commit%e6%92%a4%e9%94%80","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/21637\/","title":{"rendered":"\u600e\u4e48\u628agit\u7684commit\u64a4\u9500"},"content":{"rendered":"

\n \u64a4\u9500 git \u63d0\u4ea4\u6709\u4e09\u79cd\u65b9\u6cd5\uff1a\u4f7f\u7528 git reset \u76f4\u63a5\u64a4\u9500\u63d0\u4ea4\uff1b\u4f7f\u7528 git revert \u521b\u5efa\u76f8\u53cd\u7684\u65b0\u63d0\u4ea4\uff1b\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u57fa\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\uff0c\u8df3\u8fc7\u4e0d\u9700\u8981\u7684\u63d0\u4ea4\u3002\n<\/p><\/blockquote>\n

\"\u600e\u4e48\u628agit\u7684commit\u64a4\u9500\u63d2\u56fe\"<\/p>\n

\u5982\u4f55\u64a4\u9500 Git \u7684\u63d0\u4ea4<\/strong><\/p>\n

\u5728 Git \u4e2d\uff0c\u63d0\u4ea4\u4ee3\u7801\u53d8\u66f4\u662f\u4e00\u79cd\u5c06\u4ee3\u7801\u5feb\u7167\u4fdd\u5b58\u5230\u4ee3\u7801\u5386\u53f2\u8bb0\u5f55\u4e2d\u7684\u64cd\u4f5c\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u4f60\u53ef\u80fd\u4f1a\u505a\u51fa\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u6216\u9700\u8981\u64a4\u9500\u63d0\u4ea4\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u64a4\u9500 Git \u63d0\u4ea4\u3002<\/p>\n

\u65b9\u6cd5 1\uff1a\u4f7f\u7528 reset<\/strong><\/p>\n

\u8fd9\u662f\u6700\u7b80\u5355\u4e14\u76f4\u63a5\u7684\u65b9\u6cd5\uff1a<\/p>\n

git reset <commit-ish><\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5176\u4e2d \u662f\u4f60\u8981\u64a4\u9500\u63d0\u4ea4\u7684\u63d0\u4ea4\u54c8\u5e0c\u6216\u63d0\u4ea4\u6807\u5fd7\uff08\u4f8b\u5982\uff0cHEAD~1 \u8868\u793a\u524d\u4e00\u4e2a\u63d0\u4ea4\uff09\u3002 <\/p>\n
\u65b9\u6cd5 2\uff1a\u4f7f\u7528 git revert<\/strong><\/p>\n
git revert \u547d\u4ee4\u521b\u5efa\u4e0e\u4f60\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u76f8\u53cd\u7684\u65b0\u63d0\u4ea4\u3002\u8fd9\u901a\u5e38\u7528\u4e8e\u4fdd\u7559\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u540c\u65f6\u64a4\u9500\u5bf9\u4ee3\u7801\u5e93\u7684\u66f4\u6539\u3002<\/p>\n
git revert <commit-ish><\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u65b9\u6cd5 3\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u57fa<\/strong><\/p>\n
\u4ea4\u4e92\u5f0f\u91cd\u57fa\u5141\u8bb8\u4f60\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u3002\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u542f\u52a8\u4ea4\u4e92\u5f0f\u91cd\u57fa\uff1a<\/p>\n
git rebase -i <upstream><\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5176\u4e2d \u662f\u4f60\u8981\u5c06\u5206\u652f\u4e0e\u4e4b\u91cd\u65b0\u5173\u8054\u7684\u5206\u652f\u3002\u5728\u7f16\u8f91\u5668\u4e2d\uff0c\u4f60\u53ef\u4ee5\u9009\u62e9\u8981\u64a4\u9500\u7684\u63d0\u4ea4\uff0c\u5e76\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5176\u6807\u8bb0\u4e3a\u8981\u8df3\u8fc7\u7684\u63d0\u4ea4\uff1a <\/p>\n
s <commit-ish><\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u7136\u540e\uff0c\u4fdd\u5b58\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002\u91cd\u57fa\u547d\u4ee4\u5c06\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\uff0c\u8df3\u8fc7\u6807\u8bb0\u4e3a\u8981\u8df3\u8fc7\u7684\u63d0\u4ea4\u3002<\/p>\n
\u6ce8\u610f\u4e8b\u9879<\/strong><\/p>\n
    \n
  • \u64a4\u9500\u63d0\u4ea4\u53ef\u80fd\u4f1a\u4e22\u5931\u4ee3\u7801\u53d8\u66f4\u3002\u5efa\u8bae\u5728\u64a4\u9500\u63d0\u4ea4\u4e4b\u524d\u521b\u5efa\u5907\u4efd\u3002<\/li>\n
  • \u5982\u679c\u63d0\u4ea4\u5df2\u88ab\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5219\u65e0\u6cd5\u64a4\u9500\u3002<\/li>\n
  • \u5728\u5176\u4ed6\u5f00\u53d1\u4eba\u5458\u62c9\u53d6\u63d0\u4ea4\u540e\uff0c\u5207\u52ff\u64a4\u9500\u63d0\u4ea4\u3002<\/li>\n<\/ul>\n
    \u4ee5\u4e0a\u5c31\u662f\u600e\u4e48\u628a\u7684commit\u64a4\u9500\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":"
    \u64a4\u9500 git \u63d0\u4ea4\u6709\u4e09\u79cd\u65b9\u6cd5\uff1a\u4f7f\u7528 git reset \u76f4\u63a5\u64a4\u9500\u63d0\u4ea4\uff1b\u4f7f\u7528 git revert \u521b\u5efa\u76f8\u53cd\u7684\u65b0\u63d0\u4ea4\uff1b\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u57fa\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\uff0c\u8df3\u8fc7\u4e0d\u9700\u8981\u7684\u63d0\u4ea4\u3002 \u5982\u4f55\u64a4\u9500 Git \u7684\u63d0\u4ea4 \u5728 Git \u4e2d\uff0c\u63d0\u4ea4\u4ee3\u7801\u53d8\u66f4\u662f\u4e00\u79cd\u5c06\u4ee3\u7801\u5feb\u7167\u4fdd\u5b58\u5230\u4ee3\u7801\u5386\u53f2\u8bb0\u5f55\u4e2d\u7684\u64cd\u4f5c\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u4f60\u53ef\u80fd\u4f1a\u505a\u51fa\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u6216\u9700\u8981\u64a4\u9500\u63d0\u4ea4\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u64a4\u9500 Git \u63d0\u4ea4\u3002 \u65b9\u6cd5 1\uff1a\u4f7f\u7528 reset \u8fd9\u662f\u6700\u7b80\u5355\u4e14\u76f4\u63a5\u7684\u65b9\u6cd5\uff1a git reset <commit-ish> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u4f60\u8981\u64a4\u9500\u63d0\u4ea4\u7684\u63d0\u4ea4\u54c8\u5e0c\u6216\u63d0\u4ea4\u6807\u5fd7\uff08\u4f8b\u5982\uff0cHEAD~1 \u8868\u793a\u524d\u4e00\u4e2a\u63d0\u4ea4\uff09\u3002 \u65b9\u6cd5 2\uff1a\u4f7f\u7528 git revert git revert \u547d\u4ee4\u521b\u5efa\u4e0e\u4f60\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u76f8\u53cd\u7684\u65b0\u63d0\u4ea4\u3002\u8fd9\u901a\u5e38\u7528\u4e8e\u4fdd\u7559\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u540c\u65f6\u64a4\u9500\u5bf9\u4ee3\u7801\u5e93\u7684\u66f4\u6539\u3002 git revert <commit-ish> \u767b\u5f55\u540e\u590d\u5236 \u65b9\u6cd5 3\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u57fa \u4ea4\u4e92\u5f0f\u91cd\u57fa\u5141\u8bb8\u4f60\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u3002\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u542f\u52a8\u4ea4\u4e92\u5f0f\u91cd\u57fa\uff1a git rebase -i <upstream> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u4f60\u8981\u5c06\u5206\u652f\u4e0e\u4e4b\u91cd\u65b0\u5173\u8054\u7684\u5206\u652f\u3002\u5728\u7f16\u8f91\u5668\u4e2d\uff0c\u4f60\u53ef\u4ee5\u9009\u62e9\u8981\u64a4\u9500\u7684\u63d0\u4ea4\uff0c\u5e76\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5176\u6807\u8bb0\u4e3a\u8981\u8df3\u8fc7\u7684\u63d0\u4ea4\uff1a s <commit-ish> \u767b\u5f55\u540e\u590d\u5236 \u7136\u540e\uff0c\u4fdd\u5b58\u5e76\u9000\u51fa\u7f16\u8f91\u5668\u3002\u91cd\u57fa\u547d\u4ee4\u5c06\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\uff0c\u8df3\u8fc7\u6807\u8bb0\u4e3a\u8981\u8df3\u8fc7\u7684\u63d0\u4ea4\u3002 \u6ce8\u610f\u4e8b\u9879 \u64a4\u9500\u63d0\u4ea4\u53ef\u80fd\u4f1a\u4e22\u5931\u4ee3\u7801\u53d8\u66f4\u3002\u5efa\u8bae\u5728\u64a4\u9500\u63d0\u4ea4\u4e4b\u524d\u521b\u5efa\u5907\u4efd\u3002 […]<\/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-21637","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21637","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=21637"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21637\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=21637"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=21637"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=21637"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}