Git示例教程 - 合并多次提交为一次

# 把当前分支commit提交之后的所有提交合并为一次
# 其实该命令可以做很多事，我们这里只讲合并提交
git rebase -i <commit>

# 创建一个空的Git仓库
mkdir repo
cd repo
git init

# 初始提交
touch a.txt
git add .
git commit -m "initial"

# 测试提交
for i in {1..5}
do
    echo $i >> a.txt
    git commit -am $i
done

$ git -P log --oneline
b340ba5 (HEAD -> master) 5
8d2b211 4
db287a3 3
e6ee31a 2
6e209bc 1
ca16b3c initial

$ git rebase -i ca16b3c # ca16b3c指的是initial提交

pick 6e209bc 1
pick e6ee31a 2
pick db287a3 3
pick 8d2b211 4
pick b340ba5 5
# 后面还有一些教程性质的注释，我们这里就省略掉了

pick 6e209bc 1
fixup e6ee31a 2
fixup db287a3 3
fixup 8d2b211 4
fixup b340ba5 5

$ git -P log -p
commit 675f74d7f006b9699c33c32855077f6d941feed1 (HEAD -> master)
Author: wangyuntao <wyt.daily@gmail.com>
Date:   Sun Nov 3 21:00:04 2019 +0800

    1
    
diff --git a/a.txt b/a.txt
index e69de29..8a1218a 100644
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5

commit ca16b3c326c65d05bc3277580e9dabb4be9ab467
Author: wangyuntao <wyt.daily@gmail.com>
Date:   Sun Nov 3 21:00:04 2019 +0800

    initial

diff --git a/a.txt b/a.txt
new file mode 100644
index 0000000..e69de29