【Git】使用 git rebase 整理提交歷史

Cannot rebase: You have unstaged changes.
Please commit or stash them.

# 暫存變更
git stash

# 進行 rebase
git rebase ...

# 取回變更
git stash pop

git rebase --autostash ...

git add .
git commit -m "暫存變更以執行 rebase"
git rebase ...

git reset HEAD~1

A --- B --- C (main)
       \
        D (dev)

git checkout dev
git rebase main

# D 的提交 ID 會和原本不一樣
A --- B --- C --- D' (dev)

# 對最近的 N 次提交執行 rebase (N 替換成數字)
git rebase -i HEAD~[N]

# 對最近的 3 次提交執行 rebase
git rebase -i HEAD~3

# 對 commit id 之後的提交執行 rebase
git rebase -i [commit id]

# 對 a1b2c3d 之後的提交執行 rebase
git rebase -i a1b2c3d

pick  a1b2c3d  初始提交
pick  d4e5f6g  修正錯誤
pick  h7i8j9k  增加新功能

# 設定操作方式可以直接使用縮寫指令也可以使用完整指令
r  a1b2c3d  初始提交
reword  d4e5f6g  修正錯誤
d  h7i8j9k  增加新功能

# 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

pick  a1b2c3d  test4
pick  d4e5f6g  test2
pick  h7i8j9k  test1
pick  y3i1j7r  test3

pick  h7i8j9k  test1
pick  d4e5f6g  test2
pick  y3i1j7r  test3
pick  a1b2c3d  test4

pick  h7i8j9k  test1
pick  d4e5f6g  test2
pick  y3i1j7r  test3
r  a1b2c3d  test4

# test4 -> test4 & test5
test4 & test5

$ git log
h7i8j9k  test1
d4e5f6g  test2
y3i1j7r  test3
a1b413d  test4 & test

r  h7i8j9k  test1
r  d4e5f6g  test2
pick  y3i1j7r  test3
r  a1b2c3d  test4

pick  h7i8j9k  test1
e  d4e5f6g  test2
pick  y3i1j7r  test3
pick  a1b2c3d  test4

# 修改檔案
vim example.txt

# 加入修改內容
git add example.txt

# 重新提交（覆蓋最新一次提交）
git commit --amend --no-edit

# 修改最新一次提交的作者名稱和信箱
git commit --amend --author="forgetfulengineer <thatforgetfulengineer@gmail.com>"

# 繼續 rebase
git rebase --continue

pick  h7i8j9k  test1
e  d4e5f6g  test2
e  y3i1j7r  test3
e  a1b2c3d  test4

pick  h7i8j9k  test1
s  d4e5f6g  test2
pick  y3i1j7r  test3
f  a1b2c3d  test4

# 設定合併後的提交訊息
add test1 & test2

$ git log
h7i8j7k  add test1 & test2
d4e2f6g  test3

pick  h7i8j9k  test1
pick  d4e5f6g  test2
d  y3i1j7r  test3
pick  a1b2c3d  test4

$ git log
pick  h7i8j9k  test1
pick  d4e5f6g  test2
pick  a1b2c3d  test4