{"id":4434,"date":"2022-03-20T00:25:09","date_gmt":"2022-03-19T16:25:09","guid":{"rendered":"https:\/\/egonlin.com\/?p=4434"},"modified":"2022-06-09T18:06:59","modified_gmt":"2022-06-09T10:06:59","slug":"%e7%ac%ac%e5%85%ad%e7%ab%a0%ef%bc%9arebase","status":"publish","type":"post","link":"https:\/\/egonlin.com\/?p=4434","title":{"rendered":"\u7b2c\u516d\u7ae0\uff1aRebase"},"content":{"rendered":"

Rebase\u53d8\u57fa<\/h1>\n

\u4e00\u3001\u4ecb\u7ecd<\/h2>\n

\u200b Rebase\u82f1\u6587\u7ffb\u8bd1\u53d8\u57fa\uff0c\u662f\u7528\u6765\u628a\u7248\u672c\u7684\u63d0\u4ea4\u65e5\u5fd7\u8fdb\u884c\u5408\u5e76\u6574\u5408\uff0c\u8ba9\u6211\u4eec\u770b\u8d77\u6765\u66f4\u52a0\u6e05\u6670\u7684\u4e00\u79cd\u673a\u5236\uff0c\u7b80\u800c\u8a00\u4e4b\u5c31\u662f\u4fee\u526a\u63d0\u4ea4\u5386\u53f2\u57fa\u7ebf
\n

\"file\"<\/div><\/p>\n

\u200b \u4e3b\u8981\u6709\u4ee5\u4e0b\u4e09\u79cd\u5e94\u7528\u573a\u666f<\/p>\n

\u4e8c\u3001\u573a\u666f\u4e00\uff1a\u628a\u672c\u5730\u540c\u4e00\u5206\u652f\u4e0a\u63d0\u4ea4\u7684\u591a\u4e2a\u7248\u672c\u6574\u5408\u6210\u4e00\u6761\u7ebf<\/h2>\n

\u200b \u7a0b\u5e8f\u5458\u5c0f\u6797\u672c\u5730\u7f16\u5199\u5e76\u63d0\u4ea4\u4e86n\u4e2a\u7248\u672c\uff0c\u8fd9n\u4e2a\u7248\u672c\u5bf9\u5c0f\u6797\u6765\u8bf4\u662f\u6709\u7528\u7684\uff0c\u4f46\u5bf9\u4e8e\u4ed6\u4eba\u6765\u8bf4\u662f\u65e0\u610f\u4e49\u7684\uff0c\u6240\u4ee5\u6211\u4eec\u6ca1\u5fc5\u8981\u5c06\u8fd9n\u4e2a\u7248\u672c\u90fd\u8ddf\u6574\u4e2a\u5206\u652f\u4e00\u8d77\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6211\u4eec\u73b0\u5728\u672c\u5730\u5c06\u8fd9n\u4e2a\u7248\u672c\u7684\u63d0\u4ea4\u8bb0\u5f55\u5408\u5e76\u6210\u4e3a\u4e00\u6761\u7136\u540e\u518d\u8ddf\u968f\u6574\u4e2a\u5206\u652f\u4e00\u8d77\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u8fd9\u4e2a\u6837\u5b50\uff0c\u5927\u5bb6\u90fd\u6e05\u6670\u4e86<\/p>\n

=====================>\u6b65\u9aa4\u4e00\uff1a\u5148\u5728\u672c\u5730\u5f00\u53d1\u3001\u63d0\u4ea43\u4e2a\u7248\u672c<=====================<\/p>\n

echo rebase_test111 > p2.txt\ngit add .\ngit commit -m "v1"\n\necho rebase_test222 > p3.txt\ngit add .\ngit commit -m "v2"\n\necho rebase_test333 > p4.txt\ngit add .\ngit commit -m "v3"\n\necho rebase_test444 > p5.txt\ngit add .\ngit commit -m "v4"\n\necho rebase_test555 > p6.txt\ngit add .\ngit commit -m "v5"<\/code><\/pre>\n
=====================>\u6b65\u9aa42: \u67e5\u770b\u65e5\u5fd7<=====================<\/p>\n
linhaifeng01@appledeMacBook-Pro test % git log --pretty=format:'%h: %s'\n497d5e0: v5\nb48d849: v4\n0290662: v3\n9fffd4c: v2\nc69d302: v1\nlinhaifeng01@appledeMacBook-Pro test % git log --graph --pretty=oneline --abbrev-commit\n* 497d5e0 (HEAD -> master) v5\n* b48d849 v4\n* 0290662 v3\n* 9fffd4c v2\n* c69d302 v1\nlinhaifeng01@appledeMacBook-Pro test % <\/code><\/pre>\n
=====================>\u6b65\u9aa43<=====================<\/p>\n
# \uff081\uff09\uff1a\u6267\u884c\u547d\u4ee4\uff0c\u8fdb\u5165Interact\u4ea4\u4e92\u754c\u9762\nlinhaifeng01@appledeMacBook-Pro test % git rebase -i 9fffd4c\n\n\u6ce8\u610f git rebase -i [startPonit] [endPoint]\n\u524d\u5f00\u540e\u95ed \u533a\u95f4 \u8fd9\u91cc\u7684 [startPonit] \u662f\u6307\u9700\u8981\u5408\u5e76\u7684commit\u7684\u524d\u4e00\u4e2acommit (\u5373\u5f53\u524d\u793a\u4f8b\u4e2d\u7684 \u201c4cb600e: feat: modify a\u201d)\u3002 \u56e0\u4e3a, \u4e09\u4e2acommit\u80af\u5b9a\u8981\u57fa\u4e8e\u4e0a\u4e00\u4e2acommit\u5408\u5e76\u6210\u4e86\u65b0\u7684commit\u3002\n\u8c28\u614e\u4f7f\u7528[endPoint] \u7701\u7565, \u5373\u9ed8\u8ba4\u8868\u793a\u4ece\u8d77\u59cbcommit\u4e00\u76f4\u5230\u6700\u540e\u4e00\u4e2a\uff0c\u4f46\u662f\u4e00\u65e6\u4f60\u586b\u5199\u4e86, \u5219\u8868\u793a [endPoint]\u540e\u9762\u7684commit\u5168\u90e8\u4e0d\u8981\u4e86!\n\n#  \uff082\uff09\u7ec8\u7aef\u4f1a\u8fdb\u5165\u9009\u62e9\u4ea4\u4e92\u754c\u9762, \u8ba9\u4f60\u8fdb\u884c\u53d8\u57fa\u9009\u62e9\u64cd\u4f5c\uff0c\u5982\u4e0b\u56fe<\/code><\/pre>\n
\"file\"<\/div>
\n
\"file\"<\/div>
\n
\"file\"<\/div>
\n
\"file\"<\/div>
\n\u67e5\u770b\u6700\u65b0\u5408\u5e76\u60c5\u51b5<\/p>\n
# \u4f1a\u53d1\u73b0\u539f\u4e09\u4e2a\u4e00\u6837\u7684\u63d0\u4ea4\u73b0\u5728\u5408\u5e76\u6210\u4e86\u4e00\u4e2a\u65b0\u7684commit\nlinhaifeng01@appledeMacBook-Pro test % git log --graph --pretty=oneline --abbrev-commit\n* a806510 (HEAD -> master) v345\n* 9fffd4c v2\n* c69d302 v1<\/code><\/pre>\n
=====================>\u6b65\u9aa44\u3001\u5c06\u53d8\u57fa\u540e\u7684\u5206\u652fpush\u5230\u8fdc\u7a0b\u5e93<=====================<\/p>\n
linhaifengdeMacBook-Pro:pro linhaifeng$ git branch\n* dev\n  master\nlinhaifengdeMacBook-Pro:pro linhaifeng$ git push origin dev<\/code><\/pre>\n
=====================>rebase\u5176\u4ed6\u7528\u6cd5<=====================
\n
\"file\"<\/div><\/p>\n
\u63d0\u70bc\uff1a<\/p>\n
git rebase -i \u7248\u672c\u53f7 # \u4f1a\u5c06\u5f53\u524d\u7248\u672c\u53f7\u5f00\u59cb\u5f80\u4e0b\u4e00\u76f4\u5230\u6307\u5b9a\u7248\u672c\u53f7\u7684\u7248\u672c\u7ed3\u675f\uff0c\u8fd9\u4e9b\u8bb0\u5f55\u5408\u5e76\u6210\u4e00\u6761\n\ngit rebase -i HEAD~3  # \u4ece\u5f53\u524d\u8bb0\u5f55\u5f00\u59cb\u627e\u6700\u8fd1\u76843\u6761\u8bb0\u5f55\u8fdb\u884c\u5408\u5e76\n\n\u6ce8\u610f\uff1a\u5c3d\u91cf\u4e0d\u8981\u5408\u5e76\u5df2\u7ecf\u63d0\u4ea4\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u8bb0\u5f55\uff0c\u5c3d\u91cf\u5408\u5e76\u672c\u5730\u7684\u3001\u4ece\u672a\u63d0\u4ea4\u5230\u8fdc\u7a0b\u7684\u8bb0\u5f55\uff0c\u5426\u5219\uff0c\u8fdc\u7a0b\u7684\u65e5\u5fd7\u8bb0\u5f55\u4e0e\u672c\u5730\u4e0d\u4e00\u81f4\u5c06\u4f1a\u66f4\u4e71\n\n\u63a8\u8350\u9605\u8bfb\uff1ahttps:\/\/blog.csdn.net\/small_white_123\/article\/details\/121563248<\/code><\/pre>\n
\u4e09\u3001\u573a\u666f\u4e8c\uff1a\u628a\u591a\u4e2a\u5206\u652f\u53d8\u57fa\u6210\u4e00\u6761\u7ebf<\/h2>\n
<\/p>
<\/div>
\u67e5\u770b\u66f4\u591a<\/h2>
\u8054\u7cfb\u7ba1\u7406\u5458\u5fae\u4fe1tutu19192010\uff0c\u6ce8\u518c\u8d26\u53f7<\/p>\n<\/div>
<\/div>
<\/td><\/tr>
<\/td><\/tr><\/tbody><\/table>
<\/td><\/tr><\/tbody><\/table><\/form>
Register<\/a><\/div>
Forgotten username or password?<\/a><\/div>
<\/div><\/div><\/div>
<\/div>","protected":false},"excerpt":{"rendered":"
Rebase\u53d8\u57fa \u4e00\u3001\u4ecb\u7ecd \u200b Rebase\u82f1\u6587\u7ffb\u8bd1\u53d8\u57fa\uff0c\u662f\u7528\u6765\u628a\u7248\u672c\u7684\u63d0\u4ea4\u65e5\u5fd7\u8fdb\u884c\u5408\u5e76\u6574\u5408\uff0c\u8ba9\u6211\u4eec\u770b\u8d77\u6765\u66f4\u52a0 […]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[274,339],"tags":[],"_links":{"self":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts\/4434"}],"collection":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4434"}],"version-history":[{"count":0,"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts\/4434\/revisions"}],"wp:attachment":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4434"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4434"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4434"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}