Week 04: Rebase 与历史重写

Before:
main:       A---B---C
feature:        \---D---E

After (git rebase main):
main:       A---B---C
feature:            \---D'---E'

# 在 feature 分支上
git rebase main

# 等价于
git rebase main feature

# 解决冲突后继续
git add .
git rebase --continue

# 跳过当前提交
git rebase --skip

# 中止 rebase
git rebase --abort

# 修改最近 3 个提交
git rebase -i HEAD~3

# 从某个提交开始
git rebase -i abc1234

# 从根提交开始
git rebase -i --root

pick abc1234 First commit
pick def5678 Second commit
pick ghi9012 Third commit

# Commands:
# p, pick   = 保留提交
# r, reword = 修改提交信息
# e, edit   = 暂停以修改
# s, squash = 合并到前一个提交
# f, fixup  = 合并但丢弃信息
# d, drop   = 删除提交
# x, exec   = 执行 shell 命令
# b, break  = 在此暂停

r abc1234 First commit
pick def5678 Second commit

pick abc1234 Add feature
s def5678 Fix typo
f ghi9012 Fix another typo

pick ghi9012 Third commit
pick abc1234 First commit
pick def5678 Second commit

pick abc1234 First commit
d def5678 Second commit
pick ghi9012 Third commit

pick abc1234 First commit
e def5678 Second commit
pick ghi9012 Third commit

# 修改文件
vim file.txt
git add file.txt
git commit --amend
git rebase --continue

# 创建 fixup 提交
git commit --fixup=abc1234
# 会创建: fixup! {原提交信息}

# 自动 rebase
git rebase -i --autosquash HEAD~5

git config --global rebase.autosquash true

git rebase --onto <newbase> <upstream> <branch>

Before:
main:       A---B---C
feature:        \---D---E
topic:              \---F---G

After (git rebase --onto main feature topic):
main:       A---B---C
                    \---F'---G'

Before:
feature: A---B---C---D---E

After (git rebase --onto A C feature):
feature: A---D'---E'
# B 和 C 被删除

# 修改提交信息
git commit --amend -m "New message"

# 添加遗漏的文件
git add forgotten.txt
git commit --amend --no-edit

# 修改作者
git commit --amend --author="Name <email>"

# 安装
pip install git-filter-repo

# 删除文件的所有历史
git filter-repo --path secrets.txt --invert-paths

# 重写作者信息
git filter-repo --mailmap mailmap.txt

# 提取子目录为新仓库
git filter-repo --subdirectory-filter src/

# 重命名文件/目录
git filter-repo --path-rename old/:new/

New Name <new@email.com> <old@email.com>

# 删除文件
git filter-branch --tree-filter 'rm -f secrets.txt' HEAD

# 重写作者
git filter-branch --env-filter '
if [ "$GIT_AUTHOR_EMAIL" = "old@email.com" ]; then
    export GIT_AUTHOR_EMAIL="new@email.com"
fi' HEAD

# 删除大文件
bfg --strip-blobs-bigger-than 100M

# 删除敏感数据
bfg --replace-text passwords.txt

# 删除特定文件
bfg --delete-files *.mp4

# 强制推送 (谨慎!)
git push --force

# 更安全的强制推送
git push --force-with-lease
# 如果远程有其他人的新提交, 会失败

# 应用单个提交
git cherry-pick abc1234

# 应用多个提交
git cherry-pick abc1234 def5678

# 应用范围 (不含起点)
git cherry-pick abc1234..ghi9012

# 应用范围 (含起点)
git cherry-pick abc1234^..ghi9012

# 不自动提交
git cherry-pick -n abc1234

# 编辑提交信息
git cherry-pick -e abc1234

# 添加来源信息
git cherry-pick -x abc1234
# 提交信息会包含: (cherry picked from commit abc1234)

# 解决冲突后继续
git add .
git cherry-pick --continue

# 跳过
git cherry-pick --skip

# 中止
git cherry-pick --abort