{"id":1421,"date":"2024-07-26T09:55:44","date_gmt":"2024-07-26T01:55:44","guid":{"rendered":"https:\/\/swordofmorning.com\/?p=1421"},"modified":"2025-10-09T13:54:44","modified_gmt":"2025-10-09T05:54:44","slug":"git-03","status":"publish","type":"post","link":"https:\/\/swordofmorning.com\/index.php\/2024\/07\/26\/git-03\/","title":{"rendered":"Git Rebase \u7684\u4e24\u4e2a\u5e94\u7528\u573a\u666f"},"content":{"rendered":"

  \u5728\u672c\u7ae0\u4e2d\u6211\u4eec\u5c06\u4ecb\u7ecd\u5e38\u89c1\u7684git rebase<\/code>\u7528\u6cd5\u3002<\/p>\n

\u4e00\u3001\u5408\u5e76commit<\/h2>\n

  \u5047\u8bbe\u6211\u4eec\u73b0\u5728\u6709\u5982\u4e0b\u7684log<\/code>\uff1a<\/p>\n

commit 72ff789d5a79cb0e79728bc86355c067b24a5b34 (HEAD -> master)\nAuthor: SwordofMorning <969211735@qq.com>\nDate:   Thu Jul 25 14:53:56 2024 +0800\n\n    rebase_02\n\ncommit 0cd3a6179b7446de5e9f12e4a6cbd85c2553e959\nAuthor: SwordofMorning <969211735@qq.com>\nDate:   Thu Jul 25 14:53:33 2024 +0800\n\n    rebase_01\n\ncommit 3bbb67450967dd8de8f6271f8f8e60119b77c3f4 (origin\/master, origin\/HEAD)\nAuthor: SwordofMorning <969211735@qq.com>\nDate:   Thu Jul 25 11:04:09 2024 +0800\n\n    RV1126 05, Trick 02\n\ncommit 261762b3aeae2e52de8484424079bc3989c8ac44\nAuthor: SwordofMorning <969211735@qq.com><\/code><\/pre>\n
  \u6211\u4eec\u5e0c\u671b\u5408\u5e76\u4e24\u4e2a\u6700\u65b0\u7684\u3001\u672a\u63d0\u4ea4\u7684commit\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\uff1a<\/p>\n
git rebase -i HEAD~2<\/code><\/pre>\n
  \u8fd9\u91cc\u7684\u7f16\u8f91\u5668\u4f7f\u7528vim\uff0c\u5982\u679c\u4f7f\u7528vscode\u5219\u4f1a\u9047\u5230\u795e\u79d8\u529b\u91cf\uff0cgitlens\u63d2\u4ef6\u4f3c\u4e4e\u4e5f\u4e0d\u652f\u6301\u5408\u5e76commit\u8fd9\u79cdrebase\u64cd\u4f5c\u3002\u7f16\u8f91\u5668\u4e2d\u4f1a\u51fa\u73b0\uff1a<\/p>\n
pick 0cd3a61 rebase_01\npick 72ff789 rebase_02\n\n# Rebase 3bbb674..72ff789 onto 3bbb674 (2 commands)\n#\n# Commands:\n# p, pick <commit> = use commit\n# r, reword <commit> = use commit, but edit the commit message\n# e, edit <commit> = use commit, but stop for amending\n# s, squash <commit> = use commit, but meld into previous commit\n# f, fixup <commit> = like "squash", but discard this commit's log message\n# x, exec <command> = run command (the rest of the line) using shell\n# b, break = stop here (continue rebase later with 'git rebase --continue')\n# d, drop <commit> = remove commit\n# l, label <label> = label current HEAD with a name\n# t, reset <label> = reset HEAD to a label\n# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n# .       create a merge commit using the original merge commit's\n# .       message (or the oneline, if no original merge commit was\n# .       specified). Use -c <commit> to reword the commit message.\n#\n# These lines can be re-ordered; they are executed from top to bottom.\n#\n# If you remove a line here THAT COMMIT WILL BE LOST.\n#\n# However, if you remove everything, the rebase will be aborted.\n#<\/code><\/pre>\n
  \u6211\u4eec\u5c06\u5176\u4e2d\u4fee\u6539\u4e3a\uff1a<\/p>\n
pick 0cd3a61 rebase_01\nsquash 72ff789 rebase_02<\/code><\/pre>\n
pick<\/code>\u8868\u793a\u4fdd\u7559\u5f53\u524dcommit\uff0csquash<\/code>\u8868\u793a\u5c06\u5f53\u524dcommit\u4e0e\u4e0a\u4e00\u4e2acommit\u5408\u5e76\u3002\u4fdd\u5b58\u4e4b\u540e\u5219\u662f\u5408\u5e76\u540e\u7684commit\u4fe1\u606f\uff1a<\/p>\n
# This is a combination of 2 commits.\n# This is the 1st commit message:\n\nrebase_01\n\n# This is the commit message #2:\n\nrebase_02\n\n# Please enter the commit message for your changes. Lines starting\n# with '#' will be ignored, and an empty message aborts the commit.\n#\n# Date:      Thu Jul 25 14:53:33 2024 +0800\n#\n# interactive rebase in progress; onto 3bbb674\n# Last commands done (2 commands done):\n#    pick 0cd3a61 rebase_01\n#    squash 72ff789 rebase_02\n# No commands remaining.\n# You are currently rebasing branch 'master' on '3bbb674'.\n#\n# Changes to be committed:\n#       new file:   rebase_01.txt\n#       new file:   rebase_02.txt\n#<\/code><\/pre>\n
\u4fdd\u5b58\u4e4b\u540e\u6211\u4eec\u53ef\u4ee5\u53d1\u73b0\u6700\u65b0\u7684\u4e24\u4e2acommit\u5df2\u7ecf\u88ab\u5408\u5e76\u4e86\u3002<\/p>\n
\u4e8c\u3001\u5408\u5e76\u5206\u652f<\/h2>\n
  \u5047\u8bbe\u6211\u4eec\u73b0\u5728\u6709\u5982\u4e0b\u7684\u5de5\u4f5c\u6811\uff1a<\/p>\n
(master)B -> A \n(dev)D -> C -> B -> A\n          \u2193\n(master)E -> B -> A \n(dev)D -> C -> E -> B -> A<\/code><\/pre>\n
  \u6211\u4eec\u5728(dev)B -> A<\/code>\u4e0a\u63d0\u4ea4\u4e86D -> C -> B<\/code>\uff1b\u53e6\u4e00\u4e2a\u4eba\u5728(master)B -> A<\/code>\u4e0a\u63d0\u4ea4\u4e86E -> B<\/code>\u3002\u8fd9\u91cc\u6211\u4eec\u4f7f\u7528rebase<\/code>\u6765\u5408\u5e76\u7684\u8bdd\uff0c\u5c06\u4f1a\u4ea7\u751fD -> C -> E -> B<\/code>\u7684\u7ebf\u6027\u63d0\u4ea4\u8bb0\u5f55\uff0c\u800c\u4e0d\u4f1a\u6709merge\u4e00\u6837\u7684\u4ea4\u53c9\u3002\u4e0b\u9762\u901a\u8fc7\u5177\u4f53\u7684\u4f8b\u5b50\u6765\u770b\u4e00\u4e0b\u3002<\/p>\n
  \u4e0b\u9762\u6211\u4eec\u5728master<\/code>\u4e0a\u6709\u4e00\u6761\u65b0\u7684commit\uff0c\u5728dev\u4e0a\u6709\u4e24\u6761commit\uff0c\u6211\u4eec\u5e0c\u671b\u5c06\u5176\u5408\u5e76\u3002<\/p>\n
\"\u56fe1\"