{"id":351982,"date":"2021-02-07T13:45:50","date_gmt":"2021-02-07T05:45:50","guid":{"rendered":"http:\/\/4563.org\/?p=351982"},"modified":"2021-02-07T13:45:50","modified_gmt":"2021-02-07T05:45:50","slug":"%e5%88%a0%e9%99%a4%e5%90%88%e5%b9%b6%e8%ae%b0%e5%bd%95%e3%80%8cgit-rebase-i%e3%80%8d%e5%8f%aa%e4%bf%9d%e7%95%99%e6%9c%80%e6%96%b0%e4%b8%80%e4%b8%aa","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=351982","title":{"rendered":"\u5220\u9664\u5408\u5e76\u8bb0\u5f55\u300cgit rebase -i\u300d\u53ea\u4fdd\u7559\u6700\u65b0\u4e00\u4e2a"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  \u5220\u9664\u5408\u5e76\u8bb0\u5f55\u300cgit rebase -i\u300d\u53ea\u4fdd\u7559\u6700\u65b0\u4e00\u4e2a               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : sunhk25 <\/span>  <span><i><\/i> 1<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<p>\u63d0\u4ea4\u5386\u53f2\u91cc\u6709\u4ee5\u4e0b\u5408\u5e76\uff08 merge \uff09\u64cd\u4f5c\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u53ea\u60f3\u4fdd\u7559\u6700\u65b0\u7684\u4e00\u4e2a\uff0c \u7528\u300c git rebase -i HEAD~5 \u300d\u7684\u8bdd\u5e76\u4e0d\u4f1a\u628a\u6700\u65b0\u7684\u4e94\u6761\u8bb0\u5f55\u6765 rebase\uff0c\u800c\u662f\u628a\u4e4b\u5916\u7684\u4e94\u6761 commit \u8bb0\u5f55\u6765 rebase \u3002 \u50cf\u8fd9\u79cd marge \u7684\u8bb0\u5f55\u96be\u9053\u6ca1\u6709\u529e\u6cd5\u6765\u6574\u7406\u65e0\u7528\u7684\u8bb0\u5f55\u5417\uff1f<\/p>\n<ul>\n<li>55e7853e934M Merge branch &#8216;feat_seg&#8217; into develop<\/li>\n<li>c2d1ba0e844M Merge branch &#8216;develop&#8217; into feat_seg<\/li>\n<li>fb7532325e5M Merge branch &#8216;develop&#8217; into feat_seg<\/li>\n<li>dc02b5032e0M Merge branch &#8216;develop&#8217; into feat_seg<\/li>\n<li>089a5d1890aM Merge branch &#8216;develop&#8217; into feat_seg<\/li>\n<\/ul><\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>2<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"5318792\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : baiyi <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             merge commit \u4e0d\u4f1a\u51fa\u73b0\u5728 rebase \u7684 ui \u4e2d\uff0c\u4f46\u662f\u786e\u5b9e\u80fd\u88ab rebase squash \u3002\u53ea\u8981\u4f60\u9009\u62e9\u7684 commit \u4e2d\u95f4\u5305\u542b merge commit \u5c31\u53ef\u4ee5                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5318793\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : linux40 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             squash                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>\u5220\u9664\u5408\u5e76\u8bb0\u5f55\u300cgit rebase&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/351982"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=351982"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/351982\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=351982"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=351982"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=351982"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}