使用 git rebase 合并多个 commit

首先我们查看一下当前提交历史:

复制代码
atreus-MBP:code (test) $ git log -4 --oneline
da3ba01 (HEAD -> test) 3
9d2725f 2
44f23cb 1
61e7d87 (origin/test) merge: Merge branch 'test' of https://gitee.com/atreus1125/code into test

我们通过 git rebase -i 61e7d8744f23cb9d2725fda3ba01 这三个提交合并,这里的 61e7d87待合并的提交区间的前一个提交的哈希值

复制代码
atreus-MBP:code (test) $ git rebase -i 61e7d87
[detached HEAD 92d933c] 1 & 2 & 3 2
 Date: Wed Jan 24 12:06:50 2024 +0800
 1 file changed, 1 insertion(+)
Successfully rebased and updated refs/heads/test.

执行之后会进入到 vim 编辑器中,每一行代表一个 todo 项。我们这里需要 pick 第一个提交并将后面两个提交向前压缩。

修改前:

复制代码
pick 44f23cb 1
pick 9d2725f 2
pick da3ba01 3

# Rebase 61e7d87..da3ba01 onto 61e7d87 (3 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
#                       to this position in the new commits. The <ref> is
#                       updated at the end of the rebase
#

修改后:

复制代码
pick 44f23cb 1
squash 9d2725f 2
squash da3ba01 3

# Rebase 61e7d87..da3ba01 onto 61e7d87 (3 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
#                       to this position in the new commits. The <ref> is
#                       updated at the end of the rebase
#

:wq 保存后会自动进入注释编辑,这里需要修改我们想要保留的最终 commit message。

修改前:

复制代码
# This is the commit message #2:

2

# This is the commit message #3:

3

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Wed Jan 24 12:06:50 2024 +0800
#
# interactive rebase in progress; onto 61e7d87
# Last commands done (3 commands done):
#    squash 9d2725f 2
#    squash da3ba01 3
# No commands remaining.t/COMMIT_EDITMSG" 28L, 610B
# You are currently rebasing branch 'test' on '61e7d87'.
#
# Changes to be committed:
#       modified:   src/main/java/file
#

修改后:

复制代码
1 & 2 & 3

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Wed Jan 24 12:06:50 2024 +0800
#
# interactive rebase in progress; onto 61e7d87
# Last commands done (3 commands done):
#    squash 9d2725f 2
#    squash da3ba01 3
# No commands remaining.t/COMMIT_EDITMSG" 28L, 610B
# You are currently rebasing branch 'test' on '61e7d87'.
#
# Changes to be committed:
#       modified:   src/main/java/file
#

保存后即可完成 rebase,此时 git 日志如下:

复制代码
atreus-MBP:code (test) $ git log -2 --oneline
92d933c (HEAD -> test) 1 & 2 & 3
61e7d87 (origin/test) merge: Merge branch 'test' of https://gitee.com/atreus1125/code into test
相关推荐
AIMath~9 小时前
向github中上传文件过大超过50M怎么办
网络·git·github
AIMath~13 小时前
如何将一个新的文件夹使用git 工具提交到github新仓库中
git·github
满天星830357713 小时前
【Git】原理及使用(二) (版本回退)
linux·git
愿天垂怜14 小时前
【C++脚手架】ffmpeg 库的介绍与使用
linux·服务器·开发语言·c++·ide·git·ffmpeg
月夜的风吹雨14 小时前
Linux 基础开发工具详解:从 yum 到 gdb 实战指南
linux·git·ubuntu·centos·vim
好运yoo14 小时前
git cherry-pick
git
不是光头 强15 小时前
Obsidian Git 插件安装与配置完全指南
git
.千余15 小时前
【C++】C++核心语法:函数重载与缺省参数原理与避坑
c语言·开发语言·c++·经验分享·笔记·git·学习
meowrain15 小时前
Git HTTPS Token 凭据配置指南
git·网络协议·https
Ws_1 天前
Git + Gerrit 第二课:diff、暂存区与撤销修改
git