{"id":438174,"date":"2021-04-17T08:39:58","date_gmt":"2021-04-17T00:39:58","guid":{"rendered":"http:\/\/4563.org\/?p=438174"},"modified":"2021-04-17T08:39:58","modified_gmt":"2021-04-17T00:39:58","slug":"%e5%b0%8f%e7%99%bd%e9%97%ae%e9%a2%98%ef%bc%9a-git-%e5%92%8b%e8%bf%98%e5%8e%9f%e6%8f%90%e4%ba%a4%e5%92%8c%e6%8f%90%e4%ba%a4%e8%80%85%ef%bc%9f","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=438174","title":{"rendered":"\u5c0f\u767d\u95ee\u9898\uff1a git \u548b\u8fd8\u539f\u63d0\u4ea4\u548c\u63d0\u4ea4\u8005\uff1f"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  \u5c0f\u767d\u95ee\u9898\uff1a git \u548b\u8fd8\u539f\u63d0\u4ea4\u548c\u63d0\u4ea4\u8005\uff1f               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <span><i><\/i> 0<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<p>\u573a\u666f\u662f\u8fd9\u6837\u7684<\/p>\n<p>1. \u539f\u59cb\u6587\u4ef6 A<br \/>2. \u5bf9 A \u4fee\u6539\u4e86\u7b2c 2-10 \u884c\uff0c90-100 \u884c\uff0c\u5e76\u63d0\u4ea4\u3002<br \/>3. \u4e2d\u95f4\u53c8\u6709\u82e5\u5e72\u4e2a\u63d0\u4ea4\uff0c\u5355\u72ec\u6216\u4e00\u8d77\u4fee\u6539 2-10 \u548c 90-100 \u884c\u3002<\/p>\n<p>\u73b0\u5728\u6211\u60f3\u4fdd\u7559 2-10 \u884c\u7684\u4fee\u6539\uff0c\u8ba9 90-100 \u884c\u56de\u5230\u539f\u59cb\u72b6\u6001\uff0c\u800c\u4e14\u8ba9\u8fd9\u51e0\u884c\u7684\u6700\u540e\u63d0\u4ea4\u4ecd\u7136\u539f\u4f5c\u8005\u3002<\/p>\n<p>\u8fd9\u8981\u600e\u4e48\u505a\u5230\uff1f\u6211\u4eec\u662f\u4ee3\u7801\u8c01\u4fee\u6539\u8c01\u8d1f\u8d23\uff0c\u6240\u4ee5\u4e0d\u60f3\u7559\u4e0b\u81ea\u5df1\u7684\u540d\u5b57\u3002\u3002\u3002<\/p>\n<\/p><\/div>\n<p><\/p>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>22<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"5749351\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : SenLief <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u8fd9\u660e\u660e\u662f\u4fee\u6539\u7684\uff0c\u4f60\u4e3a\u5565\u4e0d\u5199\u540d\u5b57\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749352\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : ch2 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u53ea\u80fd\u628a 3 \u8fc7\u7a0b\u7684\u6240\u6709\u63d0\u4ea4\u90fd\u64a4\u9500\uff0c\u76f4\u63a5 git reset \u5230 2 \u7684\u72b6\u6001(\u63d0\u524d\u5907\u4efd\u5f53\u524d\u7684\u4ee3\u7801)\uff0c\u7136\u540e\u91cd\u65b0\u505a 3 \u8fc7\u7a0b\u5bf9\u5176\u5b83\u4ee3\u7801\u7684\u4fee\u6539                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749353\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : crayygy <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u4ece\u539f\u59cb\u5206\u652f\u4e0a\u91cd\u65b0\u62c9\u4e00\u4e2a\u5206\u652f\u51fa\u6765\uff0c\u7136\u540e\u628a\u4f60\u73b0\u5728\u7684\u5206\u652f\u4e0a\u6240\u6709\u7684 commit \u540c\u65f6 squash merge \u4e0a\u53bb\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749354\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : no1xsyzy <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u540c\u610f #1\uff0c\u786e\u5b9e\u5c31\u662f\u4f60\u52a8\u624b\u6539\u56de\u53bb\u7684\uff0c\u539f\u4f5c\u8005\u600e\u4e48\u77e5\u9053\u4f60\u8fd9\u4e00\u6539\u56de\u53bb\u662f\u4e0d\u662f\u4f1a\u6709\u95ee\u9898\uff1f\u6307\u4e0d\u5b9a\u54ea\u513f\u4f9d\u8d56\u4e86 L90-L100 \u7684\u884c\u4e3a\uff0c\u7136\u540e\u4e00\u641e\u53d8\u6210\u539f\u4f5c\u8005\u628a\u884c\u4e3a\u6539\u56de\u53bb\u4e86\uff0c\u5c82\u4e0d\u662f\u9505\u4ece\u5929\u4e0a\u6765\uff1f<br \/>\u5f53\u7136\uff0c\u4e0d\u723d\u53ef\u4ee5\u628a\u8fd9\u51e0\u884c\u91cd\u5199\u4e00\u904d\u3002<\/p>\n<p>\u8fd8\u6709\u4e00\u79cd\u65b9\u6cd5\uff0c\u5c31\u662f\u5e72\u8106\u627e\u539f\u4f5c\u8005\u628a L90-L100 \u6539\u56de\u53bb\u3002                                                            <\/p><\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749355\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @SenLief \u7b2c 90-100 \u884c\u6211\u6ca1\u6539\u52a8\u554a\uff0c\u6062\u590d\u56de\u539f\u6765\u7684\u6837\u5b50\u4e86\uff0c\u81ea\u7136\u6700\u540e\u63d0\u4ea4\u8005\u7684\u540d\u5b57\u4e5f\u4e0d\u60f3\u53d8\u6210\u6211\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749356\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @no1xsyzy \u90a3\u628a\u8fd9\u4e9b\u63d0\u4ea4\u90fd\u5f53\u6210\u662f\u5728\u6211\u672c\u5730\u5206\u652f\u4e0a\u8fdb\u884c\u7684\uff0c\u6ca1\u6709\u5408\u5e76\u5230\u4e3b\u5206\u652f\u91cc\u3002\u6240\u4ee5\u6682\u4e14\u8ba4\u4e3a\uff0c\u6ca1\u6709\u5176\u4ed6\u5730\u65b9\u4f9d\u8d56 90-100 \u884c\u7684\u53d8\u52a8\uff0c\u53ea\u662f\u60f3\u6539\u56de\u53bb\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749357\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @ch2 \u90a3\u5c31\u662f\u7eaf\u624b\u5de5\u64cd\u4f5c\u3002\u3002\u3002\u5373\u4f7f 2-10 \u884c\u548c 90-100 \u884c\u7684\u6539\u52a8\u5404\u81ea\u72ec\u7acb\uff0c\u4e0d\u4f1a\u53d1\u751f\u51b2\u7a81\uff0c\u4e5f\u6ca1\u6709\u66f4\u667a\u80fd\u7684\u529e\u6cd5\u4e86\u4e48\u3002\u3002\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749358\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @SenLief @no1xsyzy \u90a3\u628a\u8fd9\u4e2a\u5206\u652f\u5f53\u4f5c\u662f\u6211\u672c\u5730\u7684 develop \u5206\u652f\u3002\u6211\u505a\u4e86\u597d\u591a\u4e2a\u63d0\u4ea4\u540e\uff0c\u540e\u6094\u4e86\uff0c\u60f3\u628a 90-100 \u884c\u6539\u56de\u539f\u6837\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749359\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : SenLief <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @0x47 \u90a3\u4f60\u5c31\u4e0d\u8981\u6539\u52a8\u8fd9\u4e00\u5904\uff0cgit \u4f1a\u7559\u75d5\u7684\uff0c\u4f60\u6ca1\u6539\u52a8\u4ed6\u81ea\u7136\u4e0d\u4f1a\u8bb0\u5f55\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749360\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : hundan <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u641e\u7b11 \u6062\u590d\u7b49\u4e8e\u6ca1\u4fee\u6539\uff1f \u628a\u8865\u4e01\u7ed9\u6062\u590d\u6ca1\u4e86\u627e\u8c01\u53bb\uff1f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749361\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : GeruzoniAnsasu <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             rebase -i \u5230\u4f60\u7b2c\u4e8c\u6b65\u7684\u5f00\u5934<br \/>\u6240\u6709 commit \u91cd\u65b0 edit<br \/>\u53ea\u4fee\u6539 2-10 \u884c<\/p>\n<p>\u8fd9\u6837\u540e\u9762\u7684\u5386\u53f2\u91cc 90-100 \u5c31\u5b8c\u5168\u4e0d\u4f1a\u6709\u4fee\u6539\u7684\u75d5\u8ff9                                                            <\/p><\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749362\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @hundan \u8fd9\u662f\u672c\u5730\u5f00\u53d1\u5206\u652f\uff0c\u5168\u90e8\u7684\u63d0\u4ea4\u90fd\u662f\u6211\u505a\u7684\u3002\u6211\u6539\u4e86\u8fd9\u51e0\u884c\u540e\uff0c\u540e\u6094\u4e86\uff0c\u60f3\u6539\u56de\u539f\u6837\u3002\u8fd9\u6837\u8bf4\u4f60\u80fd\u7406\u89e3\u5427\uff1f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749363\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @GeruzoniAnsasu rebase \u662f\u53ef\u4ee5\u3002\u4f46\u5982\u679c\u7b2c\u4e8c\u6b65\u540e\u6709\u5f88\u591a\u63d0\u4ea4\uff0c\u90a3\u5c31\u9700\u8981\u4e00\u6b65\u6b65\u89e3\u51b2\u7a81\uff0c\u4f1a\u5f88\u75db\u82e6\u3002\u3002\u3002<br \/>\u4e0d\u8fc7\u8c8c\u4f3c\u6ca1\u6709\u5565\u597d\u529e\u6cd5\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749364\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @crayygy squash merge \u4f1a\u628a\u5f88\u591a\u63d0\u4ea4\u90fd\u5408\u5e76\u6210\u4e00\u4e2a\u5427\u3002\u53ef\u80fd\u4e22\u4e00\u4e9b\u63d0\u4ea4\u4fe1\u606f\uff0c\u4e0d\u8fc7\u8fd9\u4e2a\u8c8c\u4f3c\u662f\u6700\u65b9\u4fbf\u7684\u529e\u6cd5\u4e86\u3002\u591a\u8c22\u8001\u54e5\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749365\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : GeruzoniAnsasu <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @0x47 \u4f60\u8981\u4e00\u6b21\u6027\u6539\u6389\u4e00\u5806\u5386\u53f2\u8fd8\u80fd\u548b \u8981\u4e0d\u5c31\u5148 squash                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749366\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @GeruzoniAnsasu \u5c31\u662f\u60f3\u95ee\u95ee\u6709\u6ca1\u6709\u66f4\u9ed1\u79d1\u6280\u7684\u529e\u6cd5                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749367\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : GuuJiang <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u8fd9\u4e0d\u5c31\u662f rebase \u7684\u5178\u578b\u4f7f\u7528\u573a\u666f\u561b<br \/>\u9996\u5148\u786e\u8ba4\u4f60\u7684\u4fee\u6539\u8fd8\u6ca1\u6709 push \u5230\u8fdc\u7a0b\u5206\u652f(\u5982\u679c\u5df2\u7ecf push \u4e86\u4f46\u662f\u786e\u8ba4\u8fd9\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u53ea\u6709\u4f60\u4e00\u4e2a\u4eba\u5728\u4f7f\u7528\u7684\u8bdd\u4e5f\u53ef\u4ee5\uff0c\u53ea\u4e0d\u8fc7\u6700\u540e\u9700\u8981\u8fdb\u884c\u4e00\u6b21 push -f \u64cd\u4f5c)<br \/>1. \u786e\u8ba4 git status \u5904\u4e8e clean \u72b6\u6001<br \/>2. \u627e\u5230\u4fee\u6539\u7b2c 2-10 \u884c\u548c 90-100 \u884c\u7684\u90a3\u6b21\u63d0\u4ea4\uff0c\u8bb0\u4e0b commit hash<br \/>3. \u6267\u884c git rebase -i &#8220;commit hash&#8221;^\uff0ccommit hash \u4e3a\u4e0a\u4e00\u6b65\u4e2d\u8bb0\u5f55\u7684\u503c\uff0c\u6ce8\u610f\u4e0d\u8981\u6f0f\u4e86\u6700\u540e\u7684^<br \/>4. \u5728\u51fa\u73b0\u7684\u754c\u9762\u4e2d\u628a\u90a3\u6b21\u63d0\u4ea4\u524d\u9762\u7684 pick \u4fee\u6539\u4e3a edit\uff0c\u5176\u4ed6\u7684\u63d0\u4ea4\u4fdd\u6301 pick<br \/>5. \u4fdd\u5b58\u9000\u51fa<br \/>6. \u4fee\u6539\u6587\u4ef6\uff0c\u628a\u5bf9 90-100 \u7684\u4fee\u6539\u8fd8\u539f<br \/>7. \u4f7f\u7528 git commit &#8211;amend \u63d0\u4ea4\uff0c\u6b64\u65f6\u6709\u9700\u8981\u7684\u8bdd\u53ef\u4ee5\u987a\u4fbf\u4fee\u6539\u63d0\u4ea4\u8bf4\u660e<br \/>8. \u6267\u884c git rebase &#8211;continue\uff0c\u5982\u679c\u540e\u9762\u7684\u63d0\u4ea4\u4e2d\u6ca1\u6709\u518d\u4fee\u6539\u8fc7 90-100 \u884c\uff0c\u90a3\u4e48\u5c31\u5230\u6b64\u7ed3\u675f\uff0c\u5426\u5219\u5c31\u4f1a\u505c\u4e0b\u6765\u63d0\u793a\u4f60\u4ea7\u751f\u51b2\u7a81\uff0c\u6b64\u65f6\u518d\u6b21\u4fee\u6539\u6587\u4ef6\u89e3\u51b3\u51b2\u7a81(\u628a\u5bf9 90-100 \u884c\u7684\u4fee\u6539\u8fd8\u539f)\uff0c\u7136\u540e\u6267\u884c git add\uff0cgit rebase &#8211;continue\uff0c\u91cd\u590d\u8fd9\u4e2a\u8fc7\u7a0b\u76f4\u5230\u6ca1\u6709\u51b2\u7a81\u4e3a\u6b62<\/p>\n<p>\u5230\u8fd9\u4e00\u6b65\u540e\u5c31\u8fbe\u5230\u4e86\u4f60\u60f3\u8981\u7684\u6548\u679c\u4e86\uff0c\u65e2\u4fdd\u6301\u4e86\u5b8c\u6574\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u540c\u65f6 90-100 \u884c\u5c31\u597d\u50cf\u4ece\u6765\u6ca1\u6709\u52a8\u8fc7\u4e00\u6837                                                            <\/p><\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749368\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 0x47 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @GuuJiang \u5bf9\u5bf9\uff0c\u662f rebase \u7684\u5178\u578b\u5e94\u7528\u573a\u666f\u3002\u4e0d\u8fc7\u6211\u662f\u5728\u5bfb\u627e\u66f4\u65b9\u4fbf\u7684\u529e\u6cd5\uff0c\u56e0\u4e3a\u8981\u89e3\u51b2\u7a81\u3002\u3002\u3002\u4e0d\u8fc7\u8fd9\u4e2a\u4e5f\u591f\u7528\u4e86\u3002\u8c22\u8c22\u8001\u54e5\uff01                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749369\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : codehz <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u4e0d\u662f\u6709\u90a3\u4e2a git blame someone else \u7684\u811a\u672c\u5417\uff0c\u5e94\u8be5\u53ef\u4ee5\u5f88\u65b9\u4fbf\u7684\u6539\u5199\u5427\uff09                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749370\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : AoEiuV020 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u7b2c\u4e00\u53cd\u5e94 rebase\uff0c\u6dfb\u52a0\u4e00\u4e2a commit \u628a\u4ee3\u7801\u6539\u5230\u60f3\u8981\u7684\u6a21\u6837\uff0c\u7136\u540e\u628a 2 \u548c 3 \u63d0\u5230\u7684\u6240\u6709 commit \u5305\u542b\u521a\u63d0\u4ea4\u7684\u4e00\u4e2a rebase \u5408\u5e76\u6210\u4e00\u4e2a commit,<br \/>\u6700\u7ec8\u53ea\u6709\u8fd9\u4e00\u4e2a commit\uff0c\u53ea\u4fee\u6539\u4e86 2-10\uff0c\u6ca1\u4fee\u6539 90-100\uff0c                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749371\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : zhuweiyou <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             rebase \u592a\u9ebb\u70e6, \u6700\u7b80\u5355\u7684\u529e\u6cd5:<\/p>\n<p>git reset &#8211;soft \u67d0\u4e2a\u5386\u53f2 commit id<\/p>\n<p>\u8fd9\u6837\u4ee3\u7801\u4f1a\u4fdd\u6301\u5f53\u524d\u7684\u4e0d\u53d8, \u5e76\u4e14\u63d0\u4ea4\u8bb0\u5f55\u4f1a\u6e05\u6389. <br \/>\u7f3a\u70b9\u662f\u9700\u8981 &#8211;force \u5f3a\u63a8\u4e00\u4e0b (\u7531\u4e8e\u5206\u652f\u662f\u4f60\u81ea\u5df1\u7684 ,\u6240\u4ee5\u5f3a\u63a8\u65e0\u6240\u8c13)                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5749372\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : no1xsyzy <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u5982\u679c\u8fd9\u51e0\u884c\u53ca\u76f8\u90bb\u884c\u6ca1\u6539\u7684\u8bdd\u4f60\u76f4\u63a5 rebase \u662f\u4e0d\u4f1a\u6709\u51b2\u7a81\u7684<br \/>git \u8981\u614e\u91cd\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>\u5c0f\u767d\u95ee\u9898\uff1a git \u548b\u8fd8\u539f\u63d0\u4ea4\u548c\u63d0&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\/438174"}],"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=438174"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/438174\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=438174"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=438174"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=438174"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}