{"id":5913,"date":"2022-01-19T09:31:46","date_gmt":"2022-01-19T01:31:46","guid":{"rendered":"http:\/\/xinyiworld.top\/wordpress\/?p=5913"},"modified":"2022-09-26T11:26:04","modified_gmt":"2022-09-26T03:26:04","slug":"git%e4%b8%80%e4%ba%9b%e5%a5%bd%e7%9a%84%e6%8a%80%e5%b7%a7%e5%8f%8a%e4%b9%a0%e6%83%af%e8%ae%b0%e5%bd%95","status":"publish","type":"post","link":"http:\/\/xinyiworld.top\/wordpress_it\/?p=5913","title":{"rendered":"Git\u4e00\u4e9b\u597d\u7684\u6280\u5de7\u53ca\u4e60\u60ef\u8bb0\u5f55"},"content":{"rendered":"<ul>\n<li>\n<p>\u5408\u5e76\u591a\u4e2acommit<br \/>\n\u8bf4\u8bf4\u6211\u7684\u4e00\u4e2a\u5408\u5e76\u591a\u4e2acommit\u7684\u573a\u666f\uff1a\u56e0\u4e3a\u4fee\u6539\u4e86\u591a\u4e2abug\uff0c\u6240\u4ee5\u672c\u5730\u6709\u591a\u4e2acommit\uff0c\u7136\u540epush\u5230gerrit\u4e4b\u540e\u62a5\u9519\uff0c\u5bfc\u81f4\u8fd9\u4e2a\u591a\u4e2acommit\u4e00\u8fde\u4e32\u62a5\u7ea2\uff0c\u611f\u89c9\u5f88\u4e0d\u53cb\u597d\u3002\u6240\u4ee5\u6211\u60f3\u662f\u4e0d\u662f\u53ef\u4ee5\u628a\u591a\u4e2acommit\u5408\u5e76\u4e3a\u4e00\u4e2acommit\uff0c\u8fd9\u6837\u5373\u4f7f\u62a5\u7ea2\u4e5f\u53ea\u6709\u4e00\u4e2acommit\u62a5\u7ea2\u3002<\/p>\n<p><a href=\"https:\/\/www.jianshu.com\/p\/964de879904a\">https:\/\/www.jianshu.com\/p\/964de879904a<\/a><\/p>\n<p><a href=\"https:\/\/blog.csdn.net\/yinchuan_111\/article\/details\/106913632\">https:\/\/blog.csdn.net\/yinchuan_111\/article\/details\/106913632<\/a>\uff08\u4e25\u683c\u6ce8\u610f\u4f5c\u8005\u5f3a\u8c03\u7684\u91cd\u70b9\uff09<\/p>\n<p>\u5b9e\u9645\u64cd\u4f5c\uff1a\u5047\u5982\u7531\u65e7\u5f80\u65b0\u6709C0-C1-C2-C3-C4-C5\u8fd9\u51e0\u4e2acommit\uff0c\u73b0\u5728\u8981\u628aC1-C5\u5408\u5e76\u4e3a\u4e00\u4e2acommit\uff0c\u5219\u8981\u505a\u5982\u4e0b\u64cd\u4f5c\uff1a<\/p>\n<\/li>\n<\/ul>\n<pre><code class=\"language-shell\">git rease -i C0\u7684commit-id\u6216\u8005git rease -i C1\u7684commit-id^\n\n\u8fd9\u65f6\u4f1a\u663e\u793ashell\u754c\u9762\npick C1\npick C2\npick C3\npick C4\npick C5\n...\n\u5c06C2-C5\u7684pick\u4fee\u6539\u4e3as\uff0c\u7136\u540e:wq!\u4fdd\u5b58\uff08\u6ce8\u610f\u7b2c\u4e00\u4e2a\u63d0\u4ea4C1\u5fc5\u987b\u662fpick\uff0c\u5982\u679c\u4e5f\u662fs\u5219\u4f1a\u62a5\u9519Cannot &#039;squash&#039; without a previous commit\uff09\n\n\u8fd9\u65f6C2-C5\u4f1a\u5408\u5e76\u5230C1\u751f\u6210\u4e00\u4e2a\u65b0\u7684commit\u5e76\u6253\u5f00shell\u7a97\u53e3\uff0c\u4f60\u53ef\u4ee5\u5728\u91cc\u9762\u7f16\u8f91commit-msg\u4fe1\u606f\u3002\u7136\u540e:wq!\u4fdd\u5b58\n\n\u901a\u8fc7git log\u67e5\u770b\u4f1a\u53d1\u73b0C1-C5\u5df2\u7ecf\u5408\u5e76\u6210\u4e00\u4e2acommit\u4e86\u3002\n<\/code><\/pre>\n<p>\u5982\u679c\u662f\u5728android studio\uff0c\u76f4\u63a5\u9009\u4e2d\u8981\u5408\u5e76\u7684commit\uff0c\u7136\u540eSquash Commits...<br \/>\n<img src=\"http:\/\/xinyiworld.top\/wordpress_it\/wp-content\/uploads\/2022\/01\/1111.png\" alt=\"\" \/><\/p>\n<ul>\n<li>\n<p>\u67e5\u770b\u6ca1\u6709push\u7684commit<br \/>\ngit cherry -v\u53ea\u80fd\u67e5\u770b\u672a\u4f20\u9001\u4ee3\u7801\u5e93\u63d0\u4ea4\u7684\u63cf\u8ff0\/\u8bf4\u660e\uff08\u552f\u4e00id\uff09<br \/>\ngit log master ^origin\/master\u5219\u53ef\u4ee5\u67e5\u770b\u672a\u4f20\u9001\u4ee3\u7801\u5e93\u63d0\u4ea4\u7684\u8be6\u7ec6\u4fe1\u606f<br \/>\n\u4f46\u662f\u5982\u679cpush\u4e4b\u540e\u518dpull\uff0c\u5219\u4e0a\u9762\u7684\u6307\u4ee4\u6253\u5370\u4e3a\u7a7a\u3002<\/p>\n<\/li>\n<li>\n<p>\u6e05\u7a7a\u5de5\u4f5c\u533a\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6<br \/>\n<a href=\"https:\/\/www.pudn.com\/news\/62cfb4645f75f3409eb5237e.html\">https:\/\/www.pudn.com\/news\/62cfb4645f75f3409eb5237e.html<\/a><br \/>\n\u4ec0\u4e48\u573a\u666f\u4e0b\u4f1a\u7528\u5230\uff1a\u5f53\u4ece\u5206\u652fA fork\u51fa\u65b0\u7684\u5206\u652fB\uff0c\u7136\u540e\u5728\u5206\u652fB\u91cc\u65b0\u5efa\u4e86\u6587\u4ef6f\uff0c\u90a3\u4e48\u518d\u5207\u56deA\u5206\u652f\uff0c\u5982\u679ccommit\u4f1a\u62a5<br \/>\n\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\uff0c\u8fd9\u65f6\u9700\u8981\u628a\u8fd9\u4e9b\u6587\u4ef6\u5220\u9664\u65b9\u53ef\u63d0\u4ea4\u3002<\/p>\n<\/li>\n<\/ul>\n<button class=\"simplefavorite-button\" data-postid=\"5913\" data-siteid=\"1\" data-groupid=\"1\" data-favoritecount=\"0\" style=\"\">\u6536\u85cf <i class=\"sf-icon-star-empty\"><\/i><\/button>","protected":false},"excerpt":{"rendered":"<p>\u5408\u5e76\u591a\u4e2acommit \u8bf4\u8bf4\u6211\u7684\u4e00\u4e2a\u5408\u5e76\u591a\u4e2acommit\u7684\u573a\u666f\uff1a\u56e0\u4e3a\u4fee\u6539\u4e86\u591a\u4e2abug\uff0c\u6240\u4ee5\u672c\u5730\u6709\u591a\u4e2ac [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[358],"tags":[],"_links":{"self":[{"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/posts\/5913"}],"collection":[{"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5913"}],"version-history":[{"count":11,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/posts\/5913\/revisions"}],"predecessor-version":[{"id":7022,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=\/wp\/v2\/posts\/5913\/revisions\/7022"}],"wp:attachment":[{"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5913"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5913"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/xinyiworld.top\/wordpress_it\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5913"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}