Git高级操作指南：交互式变基、提交手术、历史重写与复杂合并策略

git-advanced by geoffjay/claude-plugins

232 周安装量

7 GitHub Stars

GitHub

安装命令

npx skills add https://github.com/geoffjay/claude-plugins --skill git-advanced

开发代码质量命令行工具

🇨🇳中文介绍

Git 高级操作技能

本技能为经验丰富的 Git 用户提供关于高级 Git 操作、复杂的变基策略、提交手术技巧和复杂历史记录操作的全面指导。

使用时机

在以下情况下激活此技能：

执行复杂的交互式变基
重写提交历史
拆分或合并提交
高级合并策略
跨分支拣选提交
在历史记录中编辑提交信息
作者信息更改
复杂的冲突解决

交互式变基策略

基础交互式变基

# 变基最近 5 个提交
git rebase -i HEAD~5

# 从特定提交开始变基
git rebase -i abc123^

# 变基整个分支
git rebase -i main

变基命令

# 交互式变基编辑器命令：
# p, pick = 使用提交
# r, reword = 使用提交，但编辑提交信息
# e, edit = 使用提交，但暂停以进行修改
# s, squash = 使用提交，但合并到前一个提交中
# f, fixup = 类似 squash，但丢弃提交信息
# x, exec = 使用 shell 运行命令（行的其余部分）
# d, drop = 移除提交

压缩提交

# 示例：压缩最近 3 个提交
git rebase -i HEAD~3

# 在编辑器中：
pick abc123 feat: add user authentication
squash def456 fix: resolve login bug
squash ghi789 style: format code

# 压缩功能分支中的所有提交
git rebase -i main
# 将除第一个外的所有提交标记为 'squash'

修复工作流

广告位招租

在这里展示您的产品或服务

触达数万 AI 开发者，精准高效

联系我们

从历史记录中移除文件

# 从所有历史记录中移除文件
git filter-branch --tree-filter 'rm -f passwords.txt' HEAD

# 使用 index-filter 获得更好的性能
git filter-branch --index-filter 'git rm --cached --ignore-unmatch passwords.txt' HEAD

# 使用 git-filter-repo 的现代方法（推荐）
git filter-repo --path passwords.txt --invert-paths

# 移除大文件
git filter-repo --strip-blobs-bigger-than 10M

# 安装 BFG
# brew install bfg (macOS)
# apt-get install bfg (Ubuntu)

# 按名称移除文件
bfg --delete-files passwords.txt

# 移除大文件
bfg --strip-blobs-bigger-than 50M

# 替换历史记录中的密码
bfg --replace-text passwords.txt

# BFG 清理后
git reflog expire --expire=now --all
git gc --prune=now --aggressive

# 拣选单个提交
git cherry-pick abc123

# 拣选多个提交
git cherry-pick abc123 def456 ghi789

# 拣选提交范围
git cherry-pick abc123..ghi789

# 拣选但不提交（仅暂存）
git cherry-pick -n abc123

带冲突的拣选提交

# 当发生冲突时
git cherry-pick abc123
# 冲突：解决冲突

# 解决冲突后
git add resolved-file.go
git cherry-pick --continue

# 或中止拣选提交
git cherry-pick --abort

# 跳过当前提交
git cherry-pick --skip

# 在拣选提交期间编辑提交信息
git cherry-pick -e abc123

# 签署拣选的提交
git cherry-pick -s abc123

# 保留原始作者日期
git cherry-pick --ff abc123

# 应用更改但不保留提交归属
git cherry-pick -n abc123
git commit --author="New Author <new@example.com>"

合并提交的主线选择

# 拣选合并提交（指定父提交）
git cherry-pick -m 1 abc123

# -m 1 = 使用第一个父提交（主分支）
# -m 2 = 使用第二个父提交（合并分支）

# 示例工作流：
git log --graph --oneline
#   *   abc123 Merge pull request #123
#   |\
#   | * def456 feat: feature commit
#   * | ghi789 fix: main branch commit

# 要拣选合并并保留主分支更改：
git cherry-pick -m 1 abc123

# 递归合并（默认）
git merge -s recursive branch-name

# 我方（冲突时保留我方更改）
git merge -s ours branch-name

# 对方（冲突时保留对方更改）
git merge -s theirs branch-name

# 章鱼合并（合并 3+ 个分支）
git merge -s octopus branch1 branch2 branch3

# 子树合并
git merge -s subtree branch-name

# 我方（用我方版本解决冲突）
git merge -X ours branch-name

# 对方（用对方版本解决冲突）
git merge -X theirs branch-name

# 忽略空白字符
git merge -X ignore-space-change branch-name
git merge -X ignore-all-space branch-name

# 耐心算法（更好的冲突检测）
git merge -X patience branch-name

# 重新规范化行尾
git merge -X renormalize branch-name

# 标准三方合并
git merge feature-branch

# 使用自定义合并信息
git merge feature-branch -m "Merge feature: add authentication"

# 禁止快进（始终创建合并提交）
git merge --no-ff feature-branch

# 仅快进（如果需要合并提交则失败）
git merge --ff-only feature-branch

# 压缩合并（合并所有提交）
git merge --squash feature-branch
git commit -m "feat: add complete authentication system"

<<<<<<< HEAD (当前更改)
int result = add(a, b);
=======
int sum = calculate(a, b);
>>>>>>> feature-branch (传入更改)

# 使用合并工具
git mergetool

# 指定合并工具
git mergetool --tool=vimdiff
git mergetool --tool=meld
git mergetool --tool=kdiff3

# 配置默认合并工具
git config --global merge.tool vimdiff
git config --global mergetool.vimdiff.cmd 'vimdiff "$LOCAL" "$MERGED" "$REMOTE"'

# 检出特定版本
git checkout --ours file.go    # 保留我方版本
git checkout --theirs file.go  # 保留对方版本
git checkout --merge file.go   # 重新创建冲突标记

Rerere（重用记录的解决方案）

# 启用 rerere
git config --global rerere.enabled true

# Rerere 将自动解决之前见过的冲突
git merge feature-branch
# 发生冲突并解决
git add file.go
git commit

# 稍后，相同的冲突：
git merge another-branch
# Rerere 自动应用之前的解决方案

# 查看 rerere 缓存
git rerere status
git rerere diff

# 清除 rerere 缓存
git rerere forget file.go
git rerere clear

# 交互式暂存
git add -p file.go

# 补丁命令：
# y - 暂存此块
# n - 不暂存此块
# q - 退出（不暂存此块和剩余块）
# a - 暂存此块和所有剩余块
# d - 不暂存此块和所有剩余块
# s - 将当前块拆分为更小的块
# e - 手动编辑当前块

# 交互模式
git add -i

# 命令：
# 1: status       - 显示有更改的路径
# 2: update       - 暂存路径
# 3: revert       - 取消暂存路径
# 4: add untracked - 暂存未跟踪文件
# 5: patch        - 部分暂存
# 6: diff         - 显示暂存的更改
# 7: quit         - 退出

# 交互式暂存文件的部分内容
git add -p file.go

# 创建包含部分更改的提交
git commit -m "feat: add validation logic"

# 暂存剩余的更改
git add file.go
git commit -m "feat: add error handling"

# 软重置（保留暂存的更改）
git reset --soft HEAD~1

# 混合重置（保留未暂存的更改，默认）
git reset --mixed HEAD~1
git reset HEAD~1

# 硬重置（丢弃所有更改）
git reset --hard HEAD~1

# 重置到特定提交
git reset --hard abc123

# 重置（重写历史，用于本地更改）
git reset --hard HEAD~3

# 还原（创建新提交，对共享历史安全）
git revert HEAD
git revert HEAD~3
git revert abc123..def456

从特定提交创建分支

# 从提交创建分支
git branch new-branch abc123
git checkout new-branch

# 或使用一个命令
git checkout -b new-branch abc123

# 从远程提交创建分支
git checkout -b local-branch origin/remote-branch

# 创建孤儿分支（无父提交）
git checkout --orphan new-root
git rm -rf .

# 适用于 gh-pages、文档等
echo "# Documentation" > README.md
git add README.md
git commit -m "docs: initialize documentation"

# 设置上游分支
git branch -u origin/main

# 推送并设置上游
git push -u origin feature-branch

# 更改上游
git branch -u origin/develop

# 查看跟踪信息
git branch -vv

# 储藏特定文件
git stash push -m "WIP: feature work" file1.go file2.go

# 使用路径规范储藏
git stash push -p

# 储藏未跟踪文件
git stash -u

# 储藏包括忽略的文件
git stash -a

# 从储藏创建分支
git stash branch new-branch stash@{0}

# 创建新分支并应用储藏
git stash branch feature-work

# 从储藏应用特定文件
git checkout stash@{0} -- file.go

# 应用储藏但不删除
git stash apply stash@{0}

# 应用并删除
git stash pop stash@{0}

高级子模块操作

# 更新子模块到特定提交
cd submodule-dir
git checkout abc123
cd ..
git add submodule-dir
git commit -m "chore: update submodule to version 1.2.3"

# 更新所有子模块到最新
git submodule update --remote --merge

# 更新特定子模块
git submodule update --remote --merge path/to/submodule

# 在所有子模块中运行命令
git submodule foreach 'git checkout main'
git submodule foreach 'git pull'

# 克隆具有特定深度的子模块
git clone --recurse-submodules --depth 1 repo-url

子模块到子树的迁移

# 移除子模块
git submodule deinit path/to/submodule
git rm path/to/submodule
rm -rf .git/modules/path/to/submodule

# 添加为子树
git subtree add --prefix=path/to/submodule \
    https://github.com/user/repo.git main --squash

# 更新子树
git subtree pull --prefix=path/to/submodule \
    https://github.com/user/repo.git main --squash

高级日志和历史记录

自定义日志格式

# 单行格式，包含自定义字段
git log --pretty=format:"%h - %an, %ar : %s"

# 完整自定义格式
git log --pretty=format:"%C(yellow)%h%C(reset) %C(blue)%ad%C(reset) %C(green)%an%C(reset) %s" --date=short

# 常用格式的别名
git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"

查找丢失的提交

# 查找不在任何分支中的提交
git log --all --oneline --no-walk --decorate $(git fsck --no-reflog | grep commit | cut -d' ' -f3)

# 查找悬空提交
git fsck --lost-found

# 搜索提交信息
git log --all --grep="search term"

# 按作者查找提交
git log --author="John Doe"

# 查找修改特定代码的提交
git log -S "function_name"
git log -G "regex_pattern"

二分查找自动化

# 开始二分查找
git bisect start
git bisect bad HEAD
git bisect good abc123

# 使用脚本自动化二分查找
git bisect run ./test.sh

# test.sh 示例：
#!/bin/bash
make && make test
exit $?

# 二分查找将自动找到第一个错误的提交

重写历史前备份： 在复杂操作前创建备份分支
切勿重写已发布的历史： 仅重写本地提交
沟通变基操作： 强制推送时通知团队
使用描述性提交信息： 即使在交互式变基期间
变基后测试： 确保历史更改后代码仍然有效
本地分支优先使用变基： 保持历史线性
共享分支使用合并： 保留完整历史
签署重要提交： 发布时使用 GPG 签名
记录复杂操作： 为将来参考留下注释
知道何时停止： 有时合并提交比重写的历史更清晰

assets/ 目录中提供了额外的指南和示例：

examples/ - 复杂的变基和合并场景
scripts/ - 常见操作的自动化脚本
workflows/ - 高级工作流模式

references/ 目录中提供了：

Git 内部文档
高级变基策略
过滤分支的替代方案
冲突解决技巧

🇺🇸English

Git Advanced Operations Skill

This skill provides comprehensive guidance on advanced git operations, sophisticated rebase strategies, commit surgery techniques, and complex history manipulation for experienced git users.

When to Use

Activate this skill when:

Performing complex interactive rebases
Rewriting commit history
Splitting or combining commits
Advanced merge strategies
Cherry-picking across branches
Commit message editing in history
Author information changes
Complex conflict resolution

Interactive Rebase Strategies

Basic Interactive Rebase

# Rebase last 5 commits
git rebase -i HEAD~5

# Rebase from specific commit
git rebase -i abc123^

# Rebase entire branch
git rebase -i main

Rebase Commands

# Interactive rebase editor commands:
# p, pick = use commit
# r, reword = use commit, but edit commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like squash, but discard commit message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit

Squashing Commits

# Example: Squash last 3 commits
git rebase -i HEAD~3

# In editor:
pick abc123 feat: add user authentication
squash def456 fix: resolve login bug
squash ghi789 style: format code

# Squash all commits in feature branch
git rebase -i main
# Mark all except first as 'squash'

Fixup Workflow

# Create fixup commit automatically
git commit --fixup=abc123

# Autosquash during rebase
git rebase -i --autosquash main

# Set autosquash as default
git config --global rebase.autosquash true

# Example workflow:
git log --oneline -5
# abc123 feat: add authentication
# def456 feat: add authorization
git commit --fixup=abc123
git rebase -i --autosquash HEAD~3

Reordering Commits

# Interactive rebase
git rebase -i HEAD~5

# In editor, change order:
pick def456 feat: add database migration
pick abc123 feat: add user model
pick ghi789 feat: add API endpoints

# Reorder by moving lines:
pick abc123 feat: add user model
pick def456 feat: add database migration
pick ghi789 feat: add API endpoints

Splitting Commits

# Start interactive rebase
git rebase -i HEAD~3

# Mark commit to split with 'edit'
edit abc123 feat: add user and role features

# When rebase stops:
git reset HEAD^

# Stage and commit parts separately
git add user.go
git commit -m "feat: add user management"

git add role.go
git commit -m "feat: add role management"

# Continue rebase
git rebase --continue

Editing Old Commits

# Start interactive rebase
git rebase -i HEAD~5

# Mark commit with 'edit'
edit abc123 feat: add authentication

# When rebase stops, make changes
git add modified-file.go
git commit --amend --no-edit

# Or change commit message
git commit --amend

# Continue rebase
git rebase --continue

Commit Surgery

Amending Commits

# Amend last commit (add changes)
git add forgotten-file.go
git commit --amend --no-edit

# Amend commit message
git commit --amend -m "fix: correct typo in feature"

# Amend author information
git commit --amend --author="John Doe <john@example.com>"

# Amend date
git commit --amend --date="2024-03-15 10:30:00"

Changing Commit Messages

# Change last commit message
git commit --amend

# Change older commit messages
git rebase -i HEAD~5
# Mark commits with 'reword'

# Change commit message without opening editor
git commit --amend -m "new message" --no-edit

Changing Multiple Authors

# Filter-branch (legacy method, use filter-repo instead)
git filter-branch --env-filter '
if [ "$GIT_COMMITTER_EMAIL" = "old@example.com" ]; then
    export GIT_COMMITTER_NAME="New Name"
    export GIT_COMMITTER_EMAIL="new@example.com"
fi
if [ "$GIT_AUTHOR_EMAIL" = "old@example.com" ]; then
    export GIT_AUTHOR_NAME="New Name"
    export GIT_AUTHOR_EMAIL="new@example.com"
fi
' --tag-name-filter cat -- --branches --tags

# Modern method with git-filter-repo
git filter-repo --email-callback '
    return email.replace(b"old@example.com", b"new@example.com")
'

Removing Files from History

# Remove file from all history
git filter-branch --tree-filter 'rm -f passwords.txt' HEAD

# Better performance with index-filter
git filter-branch --index-filter 'git rm --cached --ignore-unmatch passwords.txt' HEAD

# Modern method with git-filter-repo (recommended)
git filter-repo --path passwords.txt --invert-paths

# Remove large files
git filter-repo --strip-blobs-bigger-than 10M

BFG Repo-Cleaner

# Install BFG
# brew install bfg (macOS)
# apt-get install bfg (Ubuntu)

# Remove files by name
bfg --delete-files passwords.txt

# Remove large files
bfg --strip-blobs-bigger-than 50M

# Replace passwords in history
bfg --replace-text passwords.txt

# After BFG cleanup
git reflog expire --expire=now --all
git gc --prune=now --aggressive

Advanced Cherry-Picking

Basic Cherry-Pick

# Cherry-pick single commit
git cherry-pick abc123

# Cherry-pick multiple commits
git cherry-pick abc123 def456 ghi789

# Cherry-pick range of commits
git cherry-pick abc123..ghi789

# Cherry-pick without committing (stage only)
git cherry-pick -n abc123

Cherry-Pick with Conflicts

# When conflicts occur
git cherry-pick abc123
# CONFLICT: resolve conflicts

# After resolving conflicts
git add resolved-file.go
git cherry-pick --continue

# Or abort cherry-pick
git cherry-pick --abort

# Skip current commit
git cherry-pick --skip

Cherry-Pick Options

# Edit commit message during cherry-pick
git cherry-pick -e abc123

# Sign-off cherry-picked commit
git cherry-pick -s abc123

# Keep original author date
git cherry-pick --ff abc123

# Apply changes without commit attribution
git cherry-pick -n abc123
git commit --author="New Author <new@example.com>"

Mainline Selection for Merge Commits

# Cherry-pick merge commit (specify parent)
git cherry-pick -m 1 abc123

# -m 1 = use first parent (main branch)
# -m 2 = use second parent (merged branch)

# Example workflow:
git log --graph --oneline
#   *   abc123 Merge pull request #123
#   |\
#   | * def456 feat: feature commit
#   * | ghi789 fix: main branch commit

# To cherry-pick the merge keeping main branch changes:
git cherry-pick -m 1 abc123

Advanced Merging

Merge Strategies

# Recursive merge (default)
git merge -s recursive branch-name

# Ours (keep our changes on conflict)
git merge -s ours branch-name

# Theirs (keep their changes on conflict)
git merge -s theirs branch-name

# Octopus (merge 3+ branches)
git merge -s octopus branch1 branch2 branch3

# Subtree merge
git merge -s subtree branch-name

Merge Strategy Options

# Ours (resolve conflicts with our version)
git merge -X ours branch-name

# Theirs (resolve conflicts with their version)
git merge -X theirs branch-name

# Ignore whitespace
git merge -X ignore-space-change branch-name
git merge -X ignore-all-space branch-name

# Patience algorithm (better conflict detection)
git merge -X patience branch-name

# Renormalize line endings
git merge -X renormalize branch-name

Three-Way Merge

# Standard three-way merge
git merge feature-branch

# With custom merge message
git merge feature-branch -m "Merge feature: add authentication"

# No fast-forward (always create merge commit)
git merge --no-ff feature-branch

# Fast-forward only (fail if merge commit needed)
git merge --ff-only feature-branch

# Squash merge (combine all commits)
git merge --squash feature-branch
git commit -m "feat: add complete authentication system"

Advanced Conflict Resolution

Understanding Conflict Markers

<<<<<<< HEAD (Current Change)
int result = add(a, b);
=======
int sum = calculate(a, b);
>>>>>>> feature-branch (Incoming Change)

Conflict Resolution Tools

# Use mergetool
git mergetool

# Specify merge tool
git mergetool --tool=vimdiff
git mergetool --tool=meld
git mergetool --tool=kdiff3

# Configure default merge tool
git config --global merge.tool vimdiff
git config --global mergetool.vimdiff.cmd 'vimdiff "$LOCAL" "$MERGED" "$REMOTE"'

# Check out specific version
git checkout --ours file.go    # Keep our version
git checkout --theirs file.go  # Keep their version
git checkout --merge file.go   # Recreate conflict markers

Rerere (Reuse Recorded Resolution)

# Enable rerere
git config --global rerere.enabled true

# Rerere will automatically resolve previously seen conflicts
git merge feature-branch
# Conflict occurs and is resolved
git add file.go
git commit

# Later, same conflict:
git merge another-branch
# Rerere automatically applies previous resolution

# View rerere cache
git rerere status
git rerere diff

# Clear rerere cache
git rerere forget file.go
git rerere clear

Interactive Staging

Partial File Staging

# Interactive staging
git add -p file.go

# Patch commands:
# y - stage this hunk
# n - do not stage this hunk
# q - quit (do not stage this and remaining hunks)
# a - stage this and all remaining hunks
# d - do not stage this and all remaining hunks
# s - split the current hunk into smaller hunks
# e - manually edit the current hunk

Interactive Add

# Interactive mode
git add -i

# Commands:
# 1: status       - show paths with changes
# 2: update       - stage paths
# 3: revert       - unstage paths
# 4: add untracked - stage untracked files
# 5: patch        - partial staging
# 6: diff         - show staged changes
# 7: quit         - exit

Partial Commits

# Stage part of file interactively
git add -p file.go

# Create commit with partial changes
git commit -m "feat: add validation logic"

# Stage remaining changes
git add file.go
git commit -m "feat: add error handling"

Advanced Reset Operations

Reset Modes

# Soft reset (keep changes staged)
git reset --soft HEAD~1

# Mixed reset (keep changes unstaged, default)
git reset --mixed HEAD~1
git reset HEAD~1

# Hard reset (discard all changes)
git reset --hard HEAD~1

# Reset to specific commit
git reset --hard abc123

Reset vs Revert

# Reset (rewrites history, use for local changes)
git reset --hard HEAD~3

# Revert (creates new commit, safe for shared history)
git revert HEAD
git revert HEAD~3
git revert abc123..def456

Advanced Branch Operations

Branch from Specific Commit

# Create branch from commit
git branch new-branch abc123
git checkout new-branch

# Or in one command
git checkout -b new-branch abc123

# Create branch from remote commit
git checkout -b local-branch origin/remote-branch

Orphan Branches

# Create orphan branch (no parent)
git checkout --orphan new-root
git rm -rf .

# Useful for gh-pages, documentation, etc.
echo "# Documentation" > README.md
git add README.md
git commit -m "docs: initialize documentation"

Branch Tracking

# Set upstream branch
git branch -u origin/main

# Push and set upstream
git push -u origin feature-branch

# Change upstream
git branch -u origin/develop

# View tracking information
git branch -vv

Advanced Stash Operations

Stash Specific Files

# Stash specific files
git stash push -m "WIP: feature work" file1.go file2.go

# Stash with pathspec
git stash push -p

# Stash untracked files
git stash -u

# Stash including ignored files
git stash -a

Stash to Branch

# Create branch from stash
git stash branch new-branch stash@{0}

# Creates new branch and applies stash
git stash branch feature-work

Partial Stash Application

# Apply specific files from stash
git checkout stash@{0} -- file.go

# Apply stash without dropping
git stash apply stash@{0}

# Apply and drop
git stash pop stash@{0}

Submodule Management

Advanced Submodule Operations

# Update submodule to specific commit
cd submodule-dir
git checkout abc123
cd ..
git add submodule-dir
git commit -m "chore: update submodule to version 1.2.3"

# Update all submodules to latest
git submodule update --remote --merge

# Update specific submodule
git submodule update --remote --merge path/to/submodule

# Run command in all submodules
git submodule foreach 'git checkout main'
git submodule foreach 'git pull'

# Clone with submodules at specific depth
git clone --recurse-submodules --depth 1 repo-url

Submodule to Subtree Migration

# Remove submodule
git submodule deinit path/to/submodule
git rm path/to/submodule
rm -rf .git/modules/path/to/submodule

# Add as subtree
git subtree add --prefix=path/to/submodule \
    https://github.com/user/repo.git main --squash

# Update subtree
git subtree pull --prefix=path/to/submodule \
    https://github.com/user/repo.git main --squash

Advanced Log and History

Custom Log Formatting

# One-line format with custom fields
git log --pretty=format:"%h - %an, %ar : %s"

# Full custom format
git log --pretty=format:"%C(yellow)%h%C(reset) %C(blue)%ad%C(reset) %C(green)%an%C(reset) %s" --date=short

# Aliases for common formats
git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"

Finding Lost Commits

# Find commits not in any branch
git log --all --oneline --no-walk --decorate $(git fsck --no-reflog | grep commit | cut -d' ' -f3)

# Find dangling commits
git fsck --lost-found

# Search commit messages
git log --all --grep="search term"

# Find commits by author
git log --author="John Doe"

# Find commits modifying specific code
git log -S "function_name"
git log -G "regex_pattern"

Bisect Automation

# Start bisect
git bisect start
git bisect bad HEAD
git bisect good abc123

# Automate bisect with script
git bisect run ./test.sh

# test.sh example:
#!/bin/bash
make && make test
exit $?

# Bisect will automatically find first bad commit

Best Practices

Backup Before History Rewriting: Create backup branch before complex operations
Never Rewrite Published History: Only rewrite local commits
Communicate Rebases: Inform team when force-pushing
Use Descriptive Commit Messages: Even during interactive rebase
Test After Rebase: Ensure code still works after history changes
Prefer Rebase for Local Branches: Keep history linear
Use Merge for Shared Branches: Preserve complete history
Sign Important Commits: Use GPG signing for releases
Document Complex Operations: Leave comments for future reference
Know When to Stop: Sometimes merge commits are clearer than rebased history

Resources

Additional guides and examples are available in the assets/ directory:

examples/ - Complex rebase and merge scenarios
scripts/ - Automation scripts for common operations
workflows/ - Advanced workflow patterns

See references/ directory for:

Git internals documentation
Advanced rebasing strategies
Filter-branch alternatives
Conflict resolution techniques

Weekly Installs

232

Repository

geoffjay/claude-plugins

GitHub Stars

First Seen

Jan 24, 2026

Security Audits

Gen Agent Trust HubPass SocketPass SnykPass

Installed on

gemini-cli227

codex227

opencode226

cursor225

github-copilot224

amp222

React 组合模式指南：Vercel 组件架构最佳实践，提升代码可维护性

106,200 周安装

Git高级操作指南：交互式变基、提交手术、历史重写与复杂合并策略

🇨🇳中文介绍

Git 高级操作技能

使用时机

交互式变基策略

基础交互式变基

变基命令

压缩提交

修复工作流

相关 Skills

重新排序提交

拆分提交

编辑旧提交

提交手术

修改提交

更改提交信息

更改多个作者

从历史记录中移除文件

BFG 仓库清理器

高级拣选提交

基础拣选提交

带冲突的拣选提交

拣选提交选项

合并提交的主线选择

高级合并

合并策略

合并策略选项

三方合并

高级冲突解决

理解冲突标记

冲突解决工具

Rerere（重用记录的解决方案）

交互式暂存

部分文件暂存

交互式添加

部分提交

高级重置操作

重置模式

重置 vs 还原

高级分支操作