據 AlphaMoat 統計,截至 2026-10,Git Workflows 累計下載 22,670 次、獲 7 個星標,按累計下載量在本次參與排名的 10,914 個 AI 技能中排名第 1,251 位,在「開發程式設計」分類(1,069 個)中排名第 87 位。
列表預設按累計下載量排序,也可按星標排序;詳情頁排名按累計下載量計算。
| 平台 | 累計下載 | 星標 | 評論 |
|---|---|---|---|
| ClawHub ↗ | 1.4萬 | 5 | - |
| SkillHub ↗ | 2.3萬 | 7 | — |
各平台的計數口徑不同,統計時間不一致。
涵蓋互動式變基、二分定位、並行工作樹、reflog 恢復、揀選提交、子樹與子模組、稀疏檢出及衝突處理。需安裝 Git,並按倉庫狀態選擇流程;文件明確提醒不要對已推送至共享分支的提交執行變基。
資料釋出於 2026-10-27
以下是根據技能文件生成的示例,不代表實際執行結果。
2026-09 起統計方法調整:同名技能按作者分別統計,並覆蓋全部技能。圖中虛線為調整前的月份,與之後的資料不直接比較,也不計算跨越調整的增長。 該技能有同名的其他版本,調整前的資料歸屬當前下載量最大的這一個。
| 月份 | 累計下載 | 環比 | 星標 |
|---|---|---|---|
| 2026-10 | 2.3萬 | — | 7 |
| 2026-09 | 1.4萬 | — | 5 |
| 2026-08 | 1.4萬 | +2.3% | 7 |
| 2026-07 | 1.4萬 | +4.5% | 7 |
| 2026-06 | 1.3萬 | +2.5% | 7 |
| 2026-05 | 1.3萬 | — | 7 |
| 2026-03 | 1.1萬 | — | 5 |
以下是作者釋出的原始檔案,按純文字顯示,本站未做修改或稽核;其中的連結不可點選,命令請核實後再執行。抓取於 2026-10-23。
---
name: git-workflows
description: Advanced git operations beyond add/commit/push. Use when rebasing, bisecting bugs, using worktrees for parallel development, recovering with reflog, managing subtrees/submodules, resolving merge conflicts, cherry-picking across branches, or working with monorepos.
metadata: {"clawdbot":{"emoji":"🌿","requires":{"bins":["git"]},"os":["linux","darwin","win32"]}}
---
# Git Workflows
Advanced git operations for real-world development. Covers interactive rebase, bisect, worktree, reflog recovery, subtrees, submodules, sparse checkout, conflict resolution, and monorepo patterns.
## When to Use
- Cleaning up commit history before merging (interactive rebase)
- Finding which commit introduced a bug (bisect)
- Working on multiple branches simultaneously (worktree)
- Recovering lost commits or undoing mistakes (reflog)
- Managing shared code across repos (subtree/submodule)
- Resolving complex merge conflicts
- Cherry-picking commits across branches or forks
- Working with large monorepos (sparse checkout)
## Interactive Rebase
### Squash, reorder, edit commits
```bash
# Rebase last 5 commits interactively
git rebase -i HEAD~5
# Rebase onto main (all commits since diverging)
git rebase -i main
```
The editor opens with a pick list:
```
pick a1b2c3d Add user model
pick e4f5g6h Fix typo in user model
pick i7j8k9l Add user controller
pick m0n1o2p Add user routes
pick q3r4s5t Fix import in controller
```
Commands available:
```
pick = use commit as-is
reword = use commit but edit the message
edit = stop after this commit to amend it
squash = merge into previous commit (keep both messages)
fixup = merge into previous commit (discard this message)
drop = remove the commit entirely
```
### Common patterns
```bash
# Squash fix commits into their parent
# Change "pick" to "fixup" for the fix commits:
pick a1b2c3d Add user model
fixup e4f5g6h Fix typo in user model
pick i7j8k9l Add user controller
fixup q3r4s5t Fix import in controller
pick m0n1o2p Add user routes
# Reorder commits (just move lines)
pick i7j8k9l Add user controller
pick m0n1o2p Add user routes
pick a1b2c3d Add user model
# Split a commit into two
# Mark as "edit", then when it stops:
git reset HEAD~
git add src/model.ts
git commit -m "Add user model"
git add src/controller.ts
git commit -m "Add user controller"
git rebase --continue
```
### Autosquash (commit messages that auto-arrange)
```bash
# When committing a fix, reference the commit to squash into
git commit --fixup=a1b2c3d -m "Fix typo"
# or
git commit --squash=a1b2c3d -m "Additional changes"
# Later, rebase with autosquash
git rebase -i --autosquash main
# fixup/squash commits are automatically placed after their targets
```
### Abort or continue
```bash
git rebase --abort # Cancel and restore original state
git rebase --continue # Continue after resolving conflicts or editing
git rebase --skip # Skip the current commit and continue
```
## Bisect (Find the Bug)
### Binary search through commits
```bash
# Start bisect
git bisect start
# Mark current commit as bad (has the bug)
git bisect bad
# Mark a known-good commit (before the bug existed)
git bisect good v1.2.0
# or: git bisect good abc123
# Git checks out a middle commit. Test it, then:
git bisect good # if this commit doesn't have the bug
git bisect bad # if this commit has the bug
# Repeat until git identifies the exact commit
# "abc123 is the first bad commit"
# Done — return to original branch
git bisect reset
```
### Automated bisect (with a test script)
```bash
# Fully automatic: git runs the script on each commit
# Script must exit 0 for good, 1 for bad
git bisect start HEAD v1.2.0
git bisect run ./test-for-bug.sh
# Example test script
cat > /tmp/test-for-bug.sh << 'EOF'
#!/bin/bash
# Return 0 if bug is NOT present, 1 if it IS
npm test -- --grep "login should redirect" 2>/dev/null
EOF
chmod +x /tmp/test-for-bug.sh
git bisect run /tmp/test-for-bug.sh
```
### Bisect with build failures
```bash
# If a commit doesn't compile, skip it
git bisect skip
# Skip a range of known-broken commits
git bisect skip v1.3.0..v1.3.5
```
## Worktree (Parallel Branches)
### Work on multiple branches simultaneously
```bash
# Add a worktree for a different branch
git worktree add ../myproject-hotfix hotfix/urgent-fix
# Creates a new directory with that branch checked out
# Add a worktree with a new branch
git worktree add ../myproject-feature -b feature/new-thing
# List worktrees
git worktree list
# Remove a worktree when done
git worktree remove ../myproject-hotfix
# Prune stale worktree references
git worktree prune
```
### Use cases
```bash
# Review a PR while keeping your current work untouched
git worktree add ../review-pr-123 origin/pr-123
# Run tests on main while developing on feature branch
git worktree add ../main-tests main
cd ../main-tests && npm test
# Compare behavior between branches side by side
git worktree add ../compare-old release/v1.0
git worktree add ../compare-new release/v2.0
```
## Reflog (Recovery)
### See everything git remembers
```bash
# Show reflog (all HEAD movements)
git reflog
# Output:
# abc123 HEAD@{0}: commit: Add feature
# def456 HEAD@{1}: rebase: moving to main
# ghi789 HEAD@{2}: checkout: moving from feature to main
# Show reflog for a specific branch
git reflog show feature/my-branch
# Show with timestamps
git reflog --date=relative
```
### Recover from mistakes
```bash
# Undo a bad rebase (find the commit before rebase in reflog)
git reflog
# Find: "ghi789 HEAD@{5}: checkout: moving from feature to main" (pre-rebase)
git reset --hard ghi789
# Recover a deleted branch
git reflog
# Find the last commit on that branch
git branch recovered-branch abc123
# Recover after reset --hard
git reflog
git reset --hard HEAD@{2} # Go back 2 reflog entries
# Recover a dropped stash
git fsck --unreachable | grep commit
# or
git stash list # if it's still there
git log --walk-reflogs --all -- stash # find dropped stash commits
```
## Cherry-Pick
### Copy specific commits to another branch
```bash
# Pick a single commit
git cherry-pick abc123
# Pick multiple commits
git cherry-pick abc123 def456 ghi789
# Pick a range (exclusive start, inclusive end)
git cherry-pick abc123..ghi789
# Pick without committing (stage changes only)
git cherry-pick --no-commit abc123
# Cherry-pick from another remote/fork
git remote add upstream https://github.com/other/repo.git
git fetch upstream
git cherry-pick upstream/main~3 # 3rd commit from upstream's main
```
### Handle conflicts during cherry-pick
```bash
# If conflicts arise:
# 1. Resolve conflicts in the files
# 2. Stage resolved files
git add resolved-file.ts
# 3. Continue
git cherry-pick --continue
# Or abort
git cherry-pick --abort
```
## Subtree and Submodule
### Subtree (simpler — copies code into your repo)
```bash
# Add a subtree
git subtree add --prefix=lib/shared https://github.com/org/shared-lib.git main --squash
# Pull updates from upstream
git subtree pull --prefix=lib/shared https://github.com/org/shared-lib.git main --squash
# Push local changes back to upstream
git subtree push --prefix=lib/shared https://github.com/org/shared-lib.git main
# Split subtree into its own branch (for extraction)
git subtree split --prefix=lib/shared -b shared-lib-standalone
```
### Submodule (pointer to another repo at a specific commit)
```bash
# Add a submodule
git submodule add https://github.com/org/shared-lib.git lib/shared
# Clone a repo with submodules
git clone --recurse-submodules https://github.com/org/main-repo.git
# Initialize submodules after clone (if forgot --recurse)
git submodule update --init --recursive
# Update submodules to latest
git submodule update --remote
# Remove a submodule
git rm lib/shared
rm -rf .git/modules/lib/shared
# Remove entry from .gitmodules if it persists
```
### When to use which
```
Subtree: Simpler, no special commands for cloners, code lives in your repo.
Use when: shared library, vendor code, infrequent upstream changes.
Submodule: Pointer to exact commit, smaller repo, clear separation.
Use when: large dependency, independent release cycle, many contributors.
```
## Sparse Checkout (Monorepo)
### Check out only the directories you need
```bash
# Enable sparse checkout
git sparse-checkout init --cone
# Select directories
git sparse-checkout set packages/my-app packages/shared-lib
# Add another directory
git sparse-checkout add packages/another-lib
# List what's checked out
git sparse-checkout list
# Disable (check out everything again)
git sparse-checkout disable
```
### Clone with sparse checkout (large monorepos)
```bash
# Partial clone + sparse checkout (fastest for huge repos)
git clone --filter=blob:none --sparse https://github.com/org/monorepo.git
cd monorepo
git sparse-checkout set packages/my-service
# No-checkout clone (just metadata)
git clone --no-checkout https://github.com/org/monorepo.git
cd monorepo
git sparse-checkout set packages/my-service
git checkout main
```
## Conflict Resolution
### Understand the conflict markers
```
<<<<<<< HEAD (or "ours")
Your changes on the current branch
=======
Their changes from the incoming branch
>>>>>>> feature-branch (or "theirs")
```
### Resolution strategies
```bash
# Accept all of ours (current branch wins)
git checkout --ours path/to/file.ts
git add path/to/file.ts
# Accept all of theirs (incoming branch wins)
git checkout --theirs path/to/file.ts
git add path/to/file.ts
# Accept ours for ALL files
git checkout --ours .
git add .
# Use a merge tool
git mergetool
# See the three-way diff (base, ours, theirs)
git diff --cc path/to/file.ts
# Show common ancestor version
git show :1:path/to/file.ts # base (common ancestor)
git show :2:path/to/file.ts # ours
git show :3:path/to/file.ts # theirs
```
### Rebase conflict workflow
```bash
# During rebase, conflicts appear one commit at a time
# 1. Fix the conflict in the file
# 2. Stage the fix
git add fixed-file.ts
# 3. Continue to next commit
git rebase --continue
# 4. Repeat until done
# If a commit is now empty after resolution
git rebase --skip
```
### Rerere (reuse recorded resolutions)
```bash
# Enable rerere globally
git config --global rerere.enabled true
# Git remembers how you resolved conflicts
# Next time the same conflict appears, it auto-resolves
# See recorded resolutions
ls .git/rr-cache/
# Forget a bad resolution
git rerere forget path/to/file.ts
```
## Stash Patterns
```bash
# Stash with a message
git stash push -m "WIP: refactoring auth flow"
# Stash specific files
git stash push -m "partial stash" -- src/auth.ts src/login.ts
# Stash including untracked files
git stash push -u -m "with untracked"
# List stashes
git stash list
# Apply most recent stash (keep in stash list)
git stash apply
# Apply and remove from stash list
git stash pop
# Apply a specific stash
git stash apply stash@{2}
# Show what's in a stash
git stash show -p stash@{0}
# Create a branch from a stash
git stash branch new-feature stash@{0}
# Drop a specific stash
git stash drop stash@{1}
# Clear all stashes
git stash clear
```
## Blame and Log Archaeology
```bash
# Who changed each line (with date)
git blame src/auth.ts
# Blame a specific line range
git blame -L 50,70 src/auth.ts
# Ignore whitespace changes in blame
git blame -w src/auth.ts
# Find when a line was deleted (search all history)
git log -S "function oldName" --oneline
# Find when a regex pattern was added/removed
git log -G "TODO.*hack" --oneline
# Follow a file through renames
git log --follow --oneline -- src/new-name.ts
# Show the commit that last touched each line, ignoring moves
git blame -M src/auth.ts
# Show log with file changes
git log --stat --oneline -20
# Show all commits affecting a specific file
git log --oneline -- src/auth.ts
# Show diff of a specific commit
git show abc123
```
## Tags and Releases
```bash
# Create annotated tag (preferred for releases)
git tag -a v1.2.0 -m "Release 1.2.0: Added auth module"
# Create lightweight tag
git tag v1.2.0
# Tag a past commit
git tag -a v1.1.0 abc123 -m "Retroactive tag for release 1.1.0"
# List tags
git tag -l
git tag -l "v1.*"
# Push tags
git push origin v1.2.0 # Single tag
git push origin --tags # All tags
# Delete a tag
git tag -d v1.2.0 # Local
git push origin --delete v1.2.0 # Remote
```
## Tips
- `git rebase -i` is the single most useful advanced git command. Learn it first.
- Never rebase commits that have been pushed to a shared branch. Rebase your local/feature work only.
- `git reflog` is your safety net. If you lose commits, they're almost always recoverable within 90 days.
- `git bisect run` with an automated test is faster than manual binary search and eliminates human error.
- Worktrees are cheaper than multiple clones — they share `.git` storage.
- Prefer `git subtree` over `git submodule` unless you have a specific reason. Subtrees are simpler for collaborators.
- Enable `rerere` globally. It remembers conflict resolutions so you never solve the same conflict twice.
- `git stash push -m "description"` is much better than bare `git stash`. You'll thank yourself when you have 5 stashes.
- `git log -S "string"` (pickaxe) is the fastest way to find when a function or variable was added or removed.
【全棧能力】程式設計大神.Skill:面向複雜真實專案的高階全棧程式設計助手。不止生成程式碼,而是從一句目標接手陌生程式碼庫,拆解需求、補齊實現、追到根因、完成重構、聯調前後端,並把結果推進到能執行、能驗證、能交付。覆蓋 Web、後端、指令碼、iOS、安卓、鴻蒙 ArkUI、微信小程式及其他技術棧,支援中英文工程、疑難 Bug、跨模組任務和長任務續做;用構建、日誌、真實入口、裝置或介面證據說明結果。僅問概念時直接回答,要求落地時持續推進到驗收或明確阻塞。
程式設計專家 Pro:融合程式設計專家 2.0.3 工程專題與程式設計大神的鴻蒙 ArkTS/ArkUI、微信小程式和小遊戲開發資料。用於專案實現、根因除錯、審查、重構、測試、架構效能分析及多端開發驗證。支援自然語言和 @專題標識,按任務讀取包內知識;只問概念時直接回答。
程式設計專家.Skill P8級程式設計助手,25年實戰經驗技能Skill,全棧:Java/Php網站/軟體專案、API設計、Bug診斷、程式碼生成、程式碼審查、重構、測試用例、效能基準、技術選型、文件生成、任務拆解、Spec驅動、Karpathy規範、CMS二次開發、前端設計、MySQL/Mariadb、專案知識圖譜,以及工程紀律層(根因除錯硬閉環、階段導航、事故復盤/SLO、威脅建模/供應鏈安全、生產就緒/漸進式釋出、AI編碼治理、面向Agent程式碼可讀性、LLM應用安全)。支援 @標識 顯式呼叫跳過路由。
程式設計專家.Skill P8級程式設計助手,25年實戰經驗技能Skill,全棧:Java/Php網站/軟體專案、API設計、Bug診斷、程式碼生成、程式碼審查、重構、測試用例、效能基準、技術選型、文件生成、任務拆解、Spec驅動、Karpathy規範、CMS二次開發、前端設計、MySQL/Mariadb、專案知識圖譜,以及工程紀律層(根因除錯硬閉環、階段導航、事故復盤/SLO、威脅建模/供應鏈安全、生產就緒/漸進式釋出、AI編碼治理、面向Agent程式碼可讀性、LLM應用安全)。支援 @標識 顯式呼叫跳過路由。
程式設計專家 Pro:融合程式設計專家 2.0.3 工程專題與程式設計大神的鴻蒙 ArkTS/ArkUI、微信小程式和小遊戲開發資料。用於專案實現、根因除錯、審查、重構、測試、架構效能分析及多端開發驗證。支援自然語言和 @專題標識,按任務讀取包內知識;只問概念時直接回答。
程式設計專家 Pro:融合程式設計專家 2.0.3 工程專題與程式設計大神的鴻蒙 ArkTS/ArkUI、微信小程式和小遊戲開發資料。用於專案實現、根因除錯、審查、重構、測試、架構效能分析及多端開發驗證。支援自然語言和 @專題標識,按任務讀取包內知識;只問概念時直接回答。
程式設計專家.Skill P8級程式設計助手,25年實戰經驗技能Skill,全棧:Java/Php網站/軟體專案、API設計、Bug診斷、程式碼生成、程式碼審查、重構、測試用例、效能基準、技術選型、文件生成、任務拆解、Spec驅動、Karpathy規範、CMS二次開發、前端設計、MySQL/Mariadb、專案知識圖譜,以及工程紀律層(根因除錯硬閉環、階段導航、事故復盤/SLO、威脅建模/供應鏈安全、生產就緒/漸進式釋出、AI編碼治理、面向Agent程式碼可讀性、LLM應用安全)。支援 @標識 顯式呼叫跳過路由。
用 gh 命令列工具檢視 GitHub 上的 PR 檢查、工作流執行與 API 查詢的技能。
在命令列查詢、設計、遷移與最佳化 SQL 資料庫。
security-audit 提供程式碼與基礎設施安全審查的清單和命令示例。
Test Patterns 指導跨語言和框架編寫、執行測試。
在命令列裡搭、測、寫文件與排錯 HTTP 介面。
解析、檢索與分析各類應用日誌,定位報錯。
資料月份:2026-10 · 下載/星標數聚合自公開技能註冊庫(ClawHub、SkillHub),按月更新。口徑說明見資料方法。