{"id":37410,"date":"2023-04-06T10:06:11","date_gmt":"2024-02-09T06:58:49","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/"},"modified":"2024-04-29T22:10:59","modified_gmt":"2024-04-29T14:10:59","slug":"%e5%85%b3%e4%ba%8egit-rebase%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/","title":{"rendered":"\u5173\u4e8egit rebase"},"content":{"rendered":"

\u76ee\u5f55<\/h1>\n

1. \u4e0a\u6b21
\n2. \u6982\u8981
\n3. \u5167\u5bb9
\n4. \u7528\u8a9e\u7684\u6458\u8981
\n5. \u611f\u60f3
\n6. \u6700\u5f8c<\/p>\n

\u4e0a\u6b21\u7684\u4e8b\u60c5<\/h1>\n

\u7ecf\u5e38\u4f7f\u7528\u7684git\u547d\u4ee4<\/p>\n

\u6982\u8ff0<\/h1>\n

\u5728\u4f7f\u7528git rebase\u547d\u4ee4\u65f6\u7ecf\u5e38\u4f7f\u7528\u7684\u9009\u9879<\/p>\n

3. \u4fe1\u606f<\/h1>\n

\u5728\u5904\u7406\u4e0d\u6613\u7406\u89e3\u7684\u63d0\u4ea4\u5386\u53f2\u6216\u5c06\u4e24\u4e2a\u6216\u66f4\u591a\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528git rebase\u547d\u4ee4\u3002<\/p>\n

\u5728\u5206\u652f\u4e0a\u4f7f\u7528git rebase\u547d\u4ee4\uff0c
\n\u9664\u975e\u5728\u4e2a\u4eba\u5f00\u53d1\u7b49\u60c5\u51b5\u4e0b\uff0c\u4e0d\u8981\u5728master\u6216main\u4e0a\u4f7f\u7528\u3002<\/p>\n

\u524d\u56de\u306egit\u8a18\u4e8b\u3092\u4e00\u90e8\u5f15\u7528\r\n\r\n# \u30ea\u30dd\u30b8\u30c8\u30ea\u521d\u671f\u5316\uff08\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210\uff09<\/span>\r\n$ <\/span>mkdir <\/span>rebase_test &&<\/span> cd <\/span>rebase_test &&<\/span> git init\r\n$ <\/span>touch <\/span>README.md &&<\/span> git add .<\/span>\r\n$ <\/span>git commit -m<\/span> init\r\n\r\n# GitHub\u4e0a\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4f5c\u6210\u3001\u30ea\u30e2\u30fc\u30c8\u306b\u3082push\u3059\u308b\u3002<\/span>\r\n# \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u4f5c\u6210\u3055\u308cweb\u4e0a\u306b\u5c55\u958b\u3055\u308c\u308b\uff08public or private)<\/span>\r\n$ <\/span>git remote add origin https:\/\/github.com\/<\u3042\u306a\u305f\u306eGitHub\u30a2\u30ab\u30a6\u30f3\u30c8\u540d>\/sample_app.git\r\n$ <\/span>git push -u<\/span> origin master\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210 static-pages\u306f\u30d6\u30e9\u30f3\u30c1\u540d<\/span>\r\n$ <\/span>git checkout -b<\/span> static-pages\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u308f\u308a\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git branch\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u3078\u5909\u66f4\u70b9\u304c\u3042\u3063\u305f\u3082\u306e\u3092Git\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u8ffd\u52a0<\/span>\r\n$ <\/span>git add -A<\/span>\r\n$ <\/span>git commit -m<\/span> \"\u5909\u66f4\u70b9\u3092\u8a18\u8f09\"<\/span>\r\n$ <\/span>git push -u<\/span> origin static-pages\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u8ffd\u8a18<\/span>\r\n$ <\/span>echo<\/span> '\u3042\u3044\u3046\u3048\u304a'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\u3042\u3044\u3046\u3048\u304a\u3068\u5165\u529b'<\/span>\r\n$ <\/span>echo<\/span> '\u304b\u304d\u304f\u3051\u3053'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b'<\/span>\r\n$ <\/span>echo<\/span> '\u3055\u3057\u3059\u305b\u305d'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b'<\/span>\r\n$ <\/span>echo<\/span> '\uff11\uff12\uff13\uff14\uff15'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> 'test'<\/span>\r\n$ <\/span>echo<\/span> 'test'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> 'test'<\/span>\r\n$ <\/span>echo<\/span> 'test'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> 'test'<\/span>\r\n$ <\/span>echo<\/span> 'test'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> 'test'<\/span>\r\n$ <\/span>echo<\/span> 'test'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b'<\/span>\r\n$ <\/span>echo<\/span> '\uff16\uff17\uff18\uff19\uff10'<\/span> >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b'<\/span>\r\n$ <\/span>echo <\/span>12345 >><\/span> README.md\r\n$ <\/span>echo <\/span>67890 >><\/span> README.md\r\n$ <\/span>git add .<\/span> &&<\/span> git commit -m<\/span> '\u6570\u5024\u3092\u3084\u308a\u76f4\u3057'<\/span>\r\n\r\n# $ git log\u3000\u3067\u30ed\u30b0\u3092\u78ba\u8a8d\u3002<\/span>\r\n# $ git log --reverse --oneline\u3068\u3084\u308b\u3068\u4e0a\u304b\u3089\u4e0b\u3078\u30ed\u30b0\u3092\u8ffd\u3046\u3053\u3068\u304c\u3067\u304d\u308b\u3002<\/span>\r\n\r\n$ <\/span>git log --reverse<\/span> --oneline<\/span>\r\nc49731e (<\/span>master)<\/span> init\r\n34e6137 \u3042\u3044\u3046\u3048\u304a\u3068\u5165\u529b\r\n206942c \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\n2d0987d \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\n8171c7d test\r\n<\/span>15d5996 test\r\n<\/span>206eeaf test\r\n<\/span>9b81a9e test\r\n<\/span>ab60d64 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\n6092d9b \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\nec06e8b (<\/span>HEAD -> static-pages)<\/span> \u6570\u5024\u3092\u3084\u308a\u76f4\u3057\r\n\r\n<\/code><\/pre>\n
\u8f93\u51fa\u76ee\u6807\u7684README.md\u5c06\u5904\u4e8e\u4ee5\u4e0b\u72b6\u6001\u3002<\/p>\n
\u3042\u3044\u3046\u3048\u304a\r\n\u304b\u304d\u304f\u3051\u3053\r\n\u3055\u3057\u3059\u305b\u305d\r\n\uff11\u3000\uff12\u3000\uff13\u3000\uff14\u3000\uff15\r\ntest\r\ntest\r\ntest\r\ntest\r\n\uff16\u3000\uff17\u3000\uff18\u3000\uff19\u3000\uff10\r\n67890\r\n12345\r\n\r\n<\/code><\/pre>\n
\u5728\u7f16\u8f91\u63d0\u4ea4\u5386\u53f2\u6216\u63d0\u4ea4\u4e4b\u524d\u901a\u8fc7git branch\u6765\u786e\u8ba4\u662f\u5728master\u8fd8\u662fmain\u4e0a\u8fdb\u884cgit rebase -i master\u7684\u64cd\u4f5c\u3002<\/p>\n
git branch      \r\n  master\r\n*<\/span> static-pages\r\n<\/code><\/pre>\n
\u786e\u8ba4\u4ee5 brunch \u521b\u5efa\uff0c\u4e14\u4e3a master \u7684\u60c5\u51b5\uff0c\u6267\u884c git rebase -i master\uff0c\u5c06\u663e\u793a\u4ee5\u4e0b\u63d0\u4ea4\u540d\u79f0\u3002
\n\u4e3b\u8981\u4f7f\u7528 s, squash \u548c e, edit\u3002
\n\u203b\u5982\u679c\u4e0d\u5c0f\u5fc3\u6253\u5f00\u4e86\uff0c\u8bf7\u76f4\u63a5\u7528 wq \u6216 q! \u5173\u95ed\uff0c\u56e0\u4e3a\u4f1a\u4fdd\u5b58\u6240\u4ee5\u5e94\u5168\u90e8\u4f7f\u7528 d \u5220\u9664\u540e\u518d\u7528 q! \u9000\u51fa vi\u3002<\/p>\n
git rebase -<\/span>i<\/span> master\r\n\r\npick 34<\/span>e6137 \u3042\u3044\u3046\u3048\u304a\u3068\u5165\u529b\r\npick 206942<\/span>c<\/span> \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\npick 2<\/span>d0987d \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\npick 8171<\/span>c7d test\r\npick 15<\/span>d5996 test\r\npick 206<\/span>eeaf test\r\npick 9<\/span>b81a9e test\r\npick ab60d64 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\npick 6092<\/span>d9b \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\npick ec06e8b \u6570\u5024\u3092\u3084\u308a\u76f4\u3057\r\npick f248ff9 \u6570\u5b57\u3084\u308a\u76f4\u3057\r\n\r\n# Rebase c49731e..<\/span>f248ff9 onto c49731e (<\/span>11<\/span> commands)<\/span>\r\n#\r\n# Commands:<\/span>\r\n# p<\/span>,<\/span> pick <<\/span>commit><\/span> =<\/span> use commit\r\n# r<\/span>,<\/span> reword <<\/span>commit><\/span> =<\/span> use commit,<\/span> but edit<\/span> the commit message\r\n# e<\/span>,<\/span> edit<\/span> <<\/span>commit><\/span> =<\/span> use commit,<\/span> but stop<\/span> for<\/span> amending\r\n# s,<\/span> squash <<\/span>commit><\/span> =<\/span> use commit,<\/span> but meld into previous<\/span> commit\r\n# f<\/span>,<\/span> fixup <<\/span>commit><\/span> =<\/span> like \"squash\"<\/span>,<\/span> but discard this commit's log<\/span> message\r\n# x<\/span>,<\/span> exec <<\/span>command><\/span> =<\/span> run command (<\/span>the rest of the line<\/span>)<\/span> using shell<\/span>\r\n# b<\/span>,<\/span> break<\/span> =<\/span> stop<\/span> here (<\/span>continue<\/span> rebase later<\/span> with 'git rebase --continue'<\/span>)<\/span>\r\n# d<\/span>,<\/span> drop<\/span> <<\/span>commit><\/span> =<\/span> remove<\/span> commit\r\n# l<\/span>,<\/span> label <<\/span>label><\/span> =<\/span> label current HEAD with a<\/span> name\r\n# t<\/span>,<\/span> reset <<\/span>label><\/span> =<\/span> reset HEAD to<\/span> a<\/span> label\r\n# m<\/span>,<\/span> merge [-<\/span>C <<\/span>commit><\/span> |<\/span> -<\/span>c<\/span> <<\/span>commit>]<\/span> <<\/span>label><\/span> [<\/span># <<\/span>oneline>]<\/span>\r\n# .<\/span>       create a<\/span> merge commit using the original merge commit's\r\n# .<\/span>       message (<\/span>or<\/span> the oneline,<\/span> if<\/span> no original merge commit was\r\n# .<\/span>       specified).<\/span> Use -<\/span>c<\/span> <<\/span>commit><\/span> to<\/span> reword the commit message.<\/span>\r\n#\r\n# These lines<\/span> can be re<\/span>-<\/span>ordered; they are executed from top<\/span> to<\/span> bottom.<\/span>\r\n#\r\n# If you remove<\/span> a<\/span> line<\/span> here THAT COMMIT WILL BE LOST.<\/span>\r\n#\r\n# However,<\/span> if<\/span> you remove<\/span> everything,<\/span> the rebase will be aborted.<\/span>\r\n#\r\n\r\n<\/code><\/pre>\n
\u7531\u4e8e\u53ef\u4ee5\u5728s\u548ce\u4e4b\u95f4\u9009\u62e9\u7701\u7565, \u6307\u5b9a\u8981\u4fee\u6539\u7684\u63d0\u4ea4(commit)
\n\u9009\u62e9\u4ecepick \u5230 s \u6216 e.
\ns: \u5f53\u60a8\u5e0c\u671b\u5408\u5e76\u63d0\u4ea4\u65f6\u4f7f\u7528\uff0c
\n\u662f\u6307\u5c06\u63d0\u4ea4\u7684\u64cd\u4f5c\u5408\u5e76\u5230s\u4e4b\u4e0a\u7684\u89c4\u8303\u3002
\ne: \u7528\u4e8e\u4ec5\u7f16\u8f91\u63d0\u4ea4\u540d\u79f0\u65f6\u4f7f\u7528\u3002<\/p>\n
pick 34<\/span>e6137 \u3042\u3044\u3046\u3048\u304a\u3068\u5165\u529b\r\npick 206942<\/span>c<\/span> \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\ne<\/span> 2<\/span>d0987d \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b   \r\npick 8171<\/span>c7d test\r\ns 15<\/span>d5996 test\r\ns 206<\/span>eeaf test\r\ns 9<\/span>b81a9e test\r\npick ab60d64 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\ne<\/span> 6092<\/span>d9b \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b   \r\npick ec06e8b \u6570\u5024\u3092\u3084\u308a\u76f4\u3057\r\npick f248ff9 \u6570\u5b57\u3084\u308a\u76f4\u3057\r\n<\/code><\/pre>\n
\u51fa\u4e86vi\u4e4b\u540e\uff0c\u88ab\u95ee\u5230\u5982\u4f55\u7f16\u8f91\u540d\u4e3a\u201c\u8f93\u5165 \u304b\u304d\u304f\u3051\u3053\u201d\u7684\u63d0\u4ea4\u3002\u8fd9\u91cc\u89e3\u91ca\u4e86\u4f7f\u7528git commit –amend\u6765\u7f16\u8f91\u63d0\u4ea4\u540d\u79f0\uff0c\u7136\u540e\u8fd0\u884cgit rebase –continue\u4ee5\u5e94\u7528\u7f16\u8f91\u3002<\/p>\n
\u5728\u90a3\u4e2a\u65f6\u5019\uff0c\u7531\u4e8e\u8ffd\u6eaf\u5230\u4e86\u76ee\u6807\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c
\n\u4ee3\u7801\u4e5f\u4f1a\u56de\u5230\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u4f46\u53ea\u8981\u6267\u884cgit rebase –continue\uff0c
\n\u5c31\u80fd\u56de\u5230\u6700\u65b0\u7684\u72b6\u6001\uff0c\u8bf7\u51b7\u9759\u5730\u8fdb\u884c\u5904\u7406\u3002
\n\u203b\u672c\u4eba\u56e0\u4e3a\u5fd8\u8bb0\u6267\u884cgit rebase –continue\u800c\u611f\u5230\u6709\u4e9b\u56f0\u60d1\u3002<\/p>\n
git rebase -i<\/span> master\r\n\r\nStopped at 2d0987d...  \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\nYou can amend the commit now, with\r\n\r\n  git commit --amend<\/span> \r\n\r\nOnce you are satisfied with your changes, run\r\n\r\n  git rebase --continue<\/span>\r\n<\/code><\/pre>\n
\u5b8c\u6210\u5f8c\uff0c\u952e\u5165\u300c\u3055\u3057\u3059\u305b\u305d\u3092\u5165\u529b\u300d\uff0c\u7136\u540e\u4f7f\u7528wq\u547d\u4ee4\u9000\u51fa\u3002\u5728\u6267\u884cgit rebase –continue\u4ee5\u5e94\u7528\u66f4\u6539\u540e\uff0c\u5c06\u663e\u793a\u4e0b\u4e00\u7f16\u8f91\u4fe1\u606f\u3002<\/p>\n
\r\n\u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b \u2190\u300c\u3055\u3057\u3059\u305b\u305d\u3092\u5165\u529b\u300d\u3078\u5909\u66f4\r\n\r\n# Please enter the commit message for<\/span> your changes<\/span>.<\/span> Lines starting\r\n# with '#'<\/span> will be ignored,<\/span> and<\/span> an empty<\/span> message aborts the commit.<\/span>\r\n#\r\n# Date:<\/span>      Mon Feb 21<\/span> 09<\/span>:<\/span>11<\/span>:<\/span>07<\/span> 2022<\/span> +<\/span>0900<\/span>\r\n#\r\n# interactive rebase in<\/span> progress; onto c49731e\r\n# Last commands done (<\/span>3<\/span> commands done):<\/span>\r\n#    pick 206942<\/span>c<\/span> \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\n#    edit<\/span> 2<\/span>d0987d \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\n# Next commands to<\/span> do<\/span> (<\/span>8<\/span> remaining commands):<\/span>\r\n#    pick 8171<\/span>c7d test\r\n#    squash 15<\/span>d5996 test\r\n# You are currently editing a<\/span> commit while<\/span> rebasing branch 'static-pages'<\/span> on<\/span> 'c49731e'<\/span>.<\/span>\r\n#\r\n# Changes to<\/span> be committed:<\/span>\r\n#       modified<\/span>:<\/span>   README.<\/span>md\r\n#\r\n\r\n<\/code><\/pre>\n
\u7531\u4e8e\u5728\u4e0b\u4e00\u4e2a\u7f16\u8f91\u72b6\u6001\u4e2d\uff0c\u8fd9\u4e2a\u90e8\u5206\u6709\u56db\u4e2a\u8fde\u7eed\u7684\u201ctest\u201d\uff0c\u6211\u4eec\u5c06\u4f7f\u7528\u201cs\uff0csquash\u201d\u6765\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n
# This is<\/span> a<\/span> combination of 4<\/span> commits.<\/span>\r\n# This is<\/span> the 1<\/span>st<\/span> commit message:<\/span>\r\n\r\ntest\r\n\r\n# This is<\/span> the commit message #2<\/span>:<\/span>\r\n\r\ntest\r\n\r\n# This is<\/span> the commit message #3<\/span>:<\/span>\r\n\r\ntest\r\n\r\n# This is<\/span> the commit message #4<\/span>:<\/span>\r\n\r\ntest\r\n\r\n# Please enter the commit message for<\/span> your changes<\/span>.<\/span> Lines starting\r\n# with '#'<\/span> will be ignored,<\/span> and<\/span> an empty<\/span> message aborts the commit.<\/span>\r\n#\r\n# Date:<\/span>      Mon Feb 21<\/span> 09<\/span>:<\/span>11<\/span>:<\/span>20<\/span> 2022<\/span> +<\/span>0900<\/span>\r\n#\r\n# interactive rebase in<\/span> progress; onto c49731e\r\n# Last commands done (<\/span>7<\/span> commands done):<\/span>\r\n#    squash 206<\/span>eeaf test\r\n#    squash 9<\/span>b81a9e test\r\n# Next commands to<\/span> do<\/span> (<\/span>4<\/span> remaining commands):<\/span>\r\n#    pick ab60d64 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\n#    edit<\/span> 6092<\/span>d9b \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\n# You are currently rebasing branch 'static-pages'<\/span> on<\/span> 'c49731e'<\/span>.<\/span>\r\n#\r\n# Changes to<\/span> be committed:<\/span>\r\n#       modified<\/span>:<\/span>   README.<\/span>md\r\n#\r\n\r\n<\/code><\/pre>\n
\u5c06\u56db\u4e2a\u540d\u4e3a\u201ctest\u201d\u7684\u63d0\u4ea4\u66f4\u6539\u4e3a\u201ctest\u603b\u7ed3\u201d\uff0c\u5e76\u4f7f\u7528wq\u9000\u51fa\u3002<\/p>\n
\r\ntest\u3092\u307e\u3068\u3081\r\n\r\n# Please enter the commit message for<\/span> your changes<\/span>.<\/span> Lines starting\r\n# with '#'<\/span> will be ignored,<\/span> and<\/span> an empty<\/span> message aborts the commit.<\/span>\r\n#\r\n# Date:<\/span>      Mon Feb 21<\/span> 09<\/span>:<\/span>11<\/span>:<\/span>20<\/span> 2022<\/span> +<\/span>0900<\/span>\r\n\r\n<\/code><\/pre>\n
\u7531\u4e8e\u5728\u4e0b\u4e00\u4e2a\u64cd\u4f5c\u4e2d\u9700\u8981\u6c42\u53d6\u201camend\u201d\uff0c\u56e0\u6b64\u5c06\u201c\u8f93\u5165678999\u201d\u66f4\u6539\u4e3a\u201c\u8f93\u51656789\u201d\u3002<\/p>\n
PC@name rebase_test % git rebase --<\/span>continue<\/span>\r\n[<\/span>detached HEAD ff04c36]<\/span> test\u3092\u307e\u3068\u3081\r\n Date:<\/span> Mon Feb 21<\/span> 09<\/span>:<\/span>11<\/span>:<\/span>20<\/span> 2022<\/span> +<\/span>0900<\/span>\r\n 1<\/span> file<\/span> changed,<\/span> 4<\/span> insertions(+)<\/span>\r\nStopped at 6092<\/span>d9b...<\/span>  \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\nYou can amend the commit now,<\/span> with\r\n\r\n  git commit --<\/span>amend \r\n\r\nOnce you are satisfied with your changes<\/span>,<\/span> run\r\n\r\n  git rebase --<\/span>continue<\/span>\r\n<\/code><\/pre>\n
\u5982\u679c\u4f7f\u7528git commit –amend\u547d\u4ee4\uff0c\u5c06\u663e\u793a\u7f16\u8f91\u754c\u9762\u3002<\/p>\n
\uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\n\r\n# Please enter the commit message for<\/span> your changes<\/span>.<\/span> Lines starting\r\n# with '#'<\/span> will be ignored,<\/span> and<\/span> an empty<\/span> message aborts the commit.<\/span>\r\n#\r\n# Date:<\/span>      Mon Feb 21<\/span> 09<\/span>:<\/span>12<\/span>:<\/span>22<\/span> 2022<\/span> +<\/span>0900<\/span>\r\n#\r\n# interactive rebase in<\/span> progress; onto c49731e\r\n# Last commands done (<\/span>9<\/span> commands done):<\/span>\r\n#    pick ab60d64 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\n#    edit<\/span> 6092<\/span>d9b \uff16\uff17\uff18\uff19\uff19\uff19\u3092\u5165\u529b\r\n# Next commands to<\/span> do<\/span> (<\/span>2<\/span> remaining commands):<\/span>\r\n#    pick ec06e8b \u6570\u5024\u3092\u3084\u308a\u76f4\u3057\r\n#    pick f248ff9 \u6570\u5b57\u3084\u308a\u76f4\u3057\r\n# You are currently editing a<\/span> commit while<\/span> rebasing branch 'static-pages'<\/span> on<\/span> 'c49731e'<\/span>.<\/span>\r\n#\r\n# Changes to<\/span> be committed:<\/span>\r\n#       modified<\/span>:<\/span>   README.<\/span>md\r\n#\r\n<\/code><\/pre>\n
\u4e4b\u5f8c\u4e0d\u8981\u5fd8\u8a18\u4f7f\u7528 “git rebase –continue” \u4f86\u63a8\u9032\u66f4\u6539\u3002
\n\u5982\u679c\u9700\u8981\u91cd\u65b0\u7de8\u8f2f\u5269\u4e0b\u7684\u6578\u5b57\u548c\u4fee\u6539\u63d0\u4ea4\u540d\u7a31\uff0c\u5247\u6240\u6709\u63d0\u4ea4\u540d\u7a31\u90fd\u6703\u88ab\u5b8c\u5168\u4fee\u6539\u3002<\/p>\n
pick ec06e8b \u6570\u5024\u3092\u3084\u308a\u76f4\u3057\r\npick f248ff9 \u6570\u5b57\u3084\u308a\u76f4\u3057\r\n<\/code><\/pre>\n
\u7528git log –reverse –oneline\u786e\u8ba4\u6240\u6709\u7f16\u8f91\u5df2\u5b8c\u6210\u3002<\/p>\n
git log<\/span> --<\/span>reverse<\/span> --<\/span>oneline\r\nc49731e (<\/span>master)<\/span> init\r\n34<\/span>e6137 \u3042\u3044\u3046\u3048\u304a\u3068\u5165\u529b\r\n206942<\/span>c<\/span> \u304b\u304d\u304f\u3051\u3053\u3092\u5165\u529b\r\n21<\/span>c07ec \u3055\u3057\u3059\u305b\u305d\u3092\u5165\u529b\r\nff04c36 test\u3092\u307e\u3068\u3081\r\nfdb8cc3 \uff11\uff12\uff13\uff14\uff15\u3092\u5165\u529b\r\n7<\/span>b57f94 6789<\/span>\u3092\u5165\u529b\r\n9<\/span>f8926f (<\/span>HEAD -><\/span> static-<\/span>pages)<\/span> \u6570\u5b57\u3084\u308a\u76f4\u3057\r\n<\/code><\/pre>\n
\u5982\u679c\u6ca1\u6709\u95ee\u9898\u7684\u8bdd\uff0c\u8fdb\u884cgit push -f\u548cmerge\u64cd\u4f5c\u3002
\n* \u5982\u679c\u662f\u4e2a\u4eba\u5f00\u53d1\uff0c\u90a3\u5c31\u53ef\u4ee5\u4e86\uff0c\u4f46\u5982\u679c\u662f\u56e2\u961f\u5408\u4f5c\u7684\u8bdd\uff0c\u5fc5\u987b\u8fdb\u884cPR\u3002<\/p>\n
merge\u3068push\r\n$ git checkout master\r\n$ git merge static-pages\r\n$ git push\r\n<\/code><\/pre>\n
\u5982\u679c\u4e0d\u9700\u8981\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\uff0c\u8bf7\u5220\u9664\u5b83\u3002<\/p>\n
\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\r\n$ git branch -d static-pages\r\n<\/code><\/pre>\n
\u4ee5\u4e0a\u662f\u901a\u8fc7git rebase\u8fdb\u884c\u7684\u63d0\u4ea4\u5408\u5e76\u548c\u63d0\u4ea4\u540d\u79f0\u7f16\u8f91\u3002
\n\u7b80\u5355\u5730\u8bf4\uff0cgit rebase\u53ef\u4ee5\u4f7f\u7528\u8fd9\u4e9b\u65b9\u6cd5\u3002<\/p>\n
\u4f7f\u6211\u4eec\u80fd\u66f4\u6e05\u695a\u5730\u4e86\u89e3\u63d0\u4ea4\u8bb0\u5f55
\n\u66f4\u6539\u63d0\u4ea4\u6d88\u606f
\n\u5c06\u4e24\u4e2a\u6216\u66f4\u591a\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a
\n\u7f16\u8f91\u5df2\u7ecf\u63d0\u4ea4\u7684\u5185\u5bb9<\/p>\n
4. \u6574\u7406\u8bcd\u6c47<\/h1>\n
\n
\u7528\u8a9e\u610f\u5473e, edit\u30b3\u30df\u30c3\u30c8\u540d\u3092\u7de8\u96c6s, squash\u30b3\u30df\u30c3\u30c8\u3092\u307e\u3068\u3081\u308b<\/div>\n<\/div>\n
5. \u611f\u53d7<\/h1>\n
\u5728\u4e0d\u592a\u660e\u767d\u7684\u60c5\u51b5\u4e0b\uff0c\u6211\u5728\u6211\u7684\u73af\u5883\u548c\u672c\u5730\u4ed3\u5e93\u4e2d\u8fdb\u884c\u4e86squash\u64cd\u4f5c\u3002\u867d\u7136\u5728\u4e00\u5b9a\u7a0b\u5ea6\u4e0a\u786e\u8ba4\u4e86\u64cd\u4f5c\uff0c\u4f46\u662f\u5728\u4f7f\u7528git rebase –continue\u6267\u884ceditd\u65f6\u5fd8\u8bb0\u4e86\u5904\u7406\uff0c\u8ba9\u6211\u51b7\u6c57\u76f4\u5192\u3002\u7136\u540e\u4f7f\u7528git reflog\u56de\u9000\u4e86\u63d0\u4ea4\u5386\u53f2\u5e76\u987a\u5229\u89e3\u51b3\u4e86\u95ee\u9898\u3002\u5173\u4e8e\u8fd9\u4e2areflog\uff0c\u6211\u6253\u7b97\u4e0b\u6b21\u603b\u7ed3\u4e00\u4e0b\u3002<\/p>\n
6. \u6700\u540e<\/h1>\n
\u6211\u4ecd\u7136\u5bf9git rebase\u7684\u77e5\u8bc6\u638c\u63e1\u5f97\u5f88\u6d45\uff0c\u6240\u4ee5\u6211\u6253\u7b97\u9010\u6b65\u8fdb\u884c\u7f16\u8f91\u548c\u66f4\u65b0\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u76ee\u5f55 1. \u4e0a\u6b21 2. \u6982\u8981 3. \u5167\u5bb9 4. \u7528\u8a9e\u7684\u6458\u8981 5. \u611f\u60f3 6. \u6700\u5f8c \u4e0a\u6b21\u7684\u4e8b\u60c5 \u7ecf\u5e38\u4f7f\u7528\u7684gi […]<\/p>\n","protected":false},"author":6,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37410","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u5173\u4e8egit rebase - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-rebase\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5173\u4e8egit rebase\" \/>\n<meta property=\"og:description\" content=\"\u76ee\u5f55 1. \u4e0a\u6b21 2. \u6982\u8981 3. \u5167\u5bb9 4. \u7528\u8a9e\u7684\u6458\u8981 5. \u611f\u60f3 6. \u6700\u5f8c \u4e0a\u6b21\u7684\u4e8b\u60c5 \u7ecf\u5e38\u4f7f\u7528\u7684gi […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-rebase\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-02-09T06:58:49+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T14:10:59+00:00\" \/>\n<meta name=\"author\" content=\"\u6587, \u7fd4\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6587, \u7fd4\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"5 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/\",\"name\":\"\u5173\u4e8egit rebase - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-02-09T06:58:49+00:00\",\"dateModified\":\"2024-04-29T14:10:59+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5173\u4e8egit rebase\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\",\"name\":\"\u6587, \u7fd4\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"caption\":\"\u6587, \u7fd4\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5173\u4e8egit rebase - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-rebase\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5173\u4e8egit rebase","og_description":"\u76ee\u5f55 1. \u4e0a\u6b21 2. \u6982\u8981 3. \u5167\u5bb9 4. \u7528\u8a9e\u7684\u6458\u8981 5. \u611f\u60f3 6. \u6700\u5f8c \u4e0a\u6b21\u7684\u4e8b\u60c5 \u7ecf\u5e38\u4f7f\u7528\u7684gi […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-rebase\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-02-09T06:58:49+00:00","article_modified_time":"2024-04-29T14:10:59+00:00","author":"\u6587, \u7fd4","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6587, \u7fd4","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"5 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/","name":"\u5173\u4e8egit rebase - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-02-09T06:58:49+00:00","dateModified":"2024-04-29T14:10:59+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5173\u4e8egit rebase"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c","name":"\u6587, \u7fd4","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","caption":"\u6587, \u7fd4"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-rebase%e3%80%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37410","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37410"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37410\/revisions"}],"predecessor-version":[{"id":87939,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37410\/revisions\/87939"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37410"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37410"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37410"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}