{"id":595,"date":"2019-11-06T11:22:17","date_gmt":"2019-11-06T03:22:17","guid":{"rendered":"http:\/\/blog.xrhoujie.com\/?p=595"},"modified":"2019-11-05T11:28:59","modified_gmt":"2019-11-05T03:28:59","slug":"git-rebase-skip","status":"publish","type":"post","link":"http:\/\/blog.xrhoujie.com\/?p=595","title":{"rendered":"git rebase &#8211;skip"},"content":{"rendered":"<p>\u95ee\u9898\u51fa\u73b0\uff1a<\/p>\n<p>\u4eca\u5929pull\u4ee3\u7801\uff0c\u5728\u6b64\u4e4b\u524d\u672c\u5730\u505a\u4e86\u4e00\u6b21\u63d0\u4ea4\uff0c\u4f46\u662f\u6ca1\u6709push\u5230\u670d\u52a1\u5668\u4e0a\u53bb\uff0cgit rebase upstream\/dev \u540e\u53d1\u73b0\u62a5\u4e86\u4e00\u4e2agit \u9519\u8bef\uff0c\u6587\u4ef6\u51b2\u7a81\u4e86\uff0c\u4e8e\u662f\u6267\u884c\u4e86\u547d\u4ee4git rebase &#8211;skip\u3002<\/p>\n<p>\u73b0\u8c61\uff1a<\/p>\n<p>git rebase &#8211;skip\u540e\u53d1\u73b0\u4e0a\u6b21\u7684commit \u63d0\u4ea4\u8bb0\u5f55\u4e0d\u5b58\u5728\u4e86<\/p>\n<p>\u89e3\u51b3\u8fc7\u7a0b\uff1a<\/p>\n<p>\u5c06\u95ee\u9898\u89e3\u5256\u5f00\u5148\u601d\u8003\uff0crebase \u7684\u8fc7\u7a0b\u662f\u600e\u6837\u7684\uff1f<\/p>\n<div>\n<div>\u6211\u4eec\u77e5\u9053rebase \u7684\u8fc7\u7a0b\u9996\u5148\u4f1a\u4ea7\u751f rebase \u5206\u652f\uff08master\uff09\u7684\u5907\u4efd\uff0c\u653e\u5230\uff08no branch \uff09\u4e34\u65f6\u5206\u652f<\/div>\n<div><\/div>\n<div>\u4e2d\u901a\u5e38\u662f\u968f\u673a\u7684\u5b57\u7b26\u4e0e\u5b9e\u6570\u7ec4\u5408\u4ea7\u751f\u7684\u3002\u518d\u5c06\u652f\u7ebf\u5206\u652f\uff08branch\uff09\u7684\u6bcf\u4e00\u6b21\u63d0\u4ea4\u4fee\u6539\uff0c\u4ee5\u8865\u4e01\u7684\u5f62<\/div>\n<div><\/div>\n<div>\u5f0f\uff0c\u4e00\u4e2a\u4e2a\u7684\u91cd\u65b0\u5e94\u7528\u5230\u4e3b\u5e72\u5206\u652f\u4e0a\u3002<\/div>\n<\/div>\n<div><\/div>\n<div><\/div>\n<div>\n<div><\/div>\n<div>\u8fd9\u4e2a\u8fc7\u7a0b\u662f\u4e00\u4e2a\u5faa\u73af\u5e94\u7528\u8865\u4e01\u7684\u8fc7\u7a0b\uff0c\u671f\u95f4\u53ea\u8981\u8865\u4e01\u4ea7\u751f\u51b2\u7a81\uff0c\u5c31\u4f1a\u505c\u6b62\u5faa\u73af\uff0c\u7b49\u5f85\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002<\/div>\n<div><\/div>\n<div>\u8fd9\u4e2a\u51b2\u7a81\u6307\u7684\u662f\u4e0a\u4e00\u4e2a\u5408\u5e76\u540e\u7248\u672c\u4e0e\u8865\u4e01\u4e4b\u95f4\u7684\u51b2\u7a81\u3002<\/div>\n<div><\/div>\n<div>\ngit rebase &#8211;skip \u547d\u4ee4\uff0c\u53ef\u4ee5\u8df3\u8fc7\u67d0\u4e00\u6b21\u8865\u4e01\uff08\u5b58\u5728\u4e0a\u4e00\u8f6e\u51b2\u7a81\u7684\u89e3\u51b3\u65b9\u6848\u4e2d\uff0c\u5df2\u7ecf\u5305\u542b\u4e86\u8fd9\u4e00\u8f6e\u7684\u8865<\/div>\n<div><\/div>\n<div>\u4e01\u5185\u5bb9\uff0c\u8fd9\u6837\u4f1a\u4f7f\u8865\u4e01\u65e0\u6548\uff0c\u9700\u8981\u8df3\u8fc7\uff09<\/div>\n<\/div>\n<div><\/div>\n<div><\/div>\n<div>\u9047\u5230\u51b2\u7a81\u540e\u00a0 git rebase \u2014continue<\/div>\n<div><\/div>\n<div><\/div>\n<div>\u5f00\u59cb\u62c6\u89e3\u4ee3\u7801\uff0c\u89e3\u51b3\u540e\u5f00\u59cb\u7f16\u8f91 \uff0c\u5982\u679c\u63d0\u4ea4\u4e0d\u4e0a\u53bb \u5c31\u76f4\u63a5\u00a0git rebase &#8211;skip<\/div>\n<div><\/div>\n<div><\/div>\n<div>\u6765\u5b8c\u5168\u5ffd\u7565\u8be5\u63d0\u4ea4\u3002\u8fd9\u6837\uff0c\u6709\u95ee\u9898\u7684\u63d0\u4ea4\u6240\u5f15\u5165\u7684\u53d8\u5316\u5c31\u4e0d\u4f1a\u88ab\u6dfb\u52a0\u5230\u5386\u53f2\u4e2d\u3002<\/div>\n<div><\/div>\n<div><\/div>\n<div>\u7136\u540e\u5f00\u59cb\u63a8\u4ee3\u7801\u5c31\u53ef\u4ee5\u4e86\uff0c<\/div>\n<div><\/div>\n<div><\/div>\n<div><strong>\u60f3\u64a4\u9500\u8fd9\u4e2a\u64cd\u4f5c\u600e\u4e48\u529e\uff0c\u8fd8\u60f3\u8981\u4e0a\u6b21commit \u7684\u64cd\u4f5c\uff1f<\/strong><\/div>\n<div><\/div>\n<div><\/div>\n<div>\n<div>\n<ul>\n<li>\u4f7f\u7528<code>git reflog<\/code>\u547d\u4ee4\u627e\u56de\u4e22\u5931\u7684commit \u4fe1\u606f<\/li>\n<li>git checkout -b recovery 5aw24s2 \uff0c\u8fd9\u4e2a\u56de\u5230commit\u65f6\u7684\u6837\u5b50\u4e86<\/li>\n<li><code>git checkout master<\/code>,<code>git merge recovery<\/code>,\u518dmerge\u56de\u4e3b\u5206\u652f\u5c31\u53ef\u4ee5\u4e86<\/li>\n<\/ul>\n<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"<p>\u95ee\u9898\u51fa\u73b0\uff1a \u4eca\u5929pull\u4ee3\u7801\uff0c\u5728\u6b64\u4e4b\u524d\u672c\u5730\u505a\u4e86\u4e00\u6b21\u63d0\u4ea4\uff0c\u4f46\u662f\u6ca1\u6709push\u5230\u670d\u52a1\u5668\u4e0a\u53bb\uff0cgit rebase u [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":165,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[14],"tags":[22],"_links":{"self":[{"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/posts\/595"}],"collection":[{"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=595"}],"version-history":[{"count":1,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/posts\/595\/revisions"}],"predecessor-version":[{"id":596,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/posts\/595\/revisions\/596"}],"wp:featuredmedia":[{"embeddable":true,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=\/wp\/v2\/media\/165"}],"wp:attachment":[{"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=595"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=595"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.xrhoujie.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=595"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}