git-workflows
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.
npx skills add BioTender-max/awesome-bio-agent-skills --skill git-workflows --agent claude-code
Same command for any agent — swap --agent for codex, cursor, copilot.
Weekly change comes from our own snapshots, not the repository page — it measures attention, not adoption.
# 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 pr
- When to Use
- Interactive Rebase
- Squash, reorder, edit commits
- Common patterns
- Autosquash (commit messages that auto-arrange)
- Abort or continue
- Bisect (Find the Bug)
- Binary search through commits
- Automated bisect (with a test script)
- Bisect with build failures
- Worktree (Parallel Branches)
- Work on multiple branches simultaneously
- Use cases
- Reflog (Recovery)
Rebase last 5 commits interactively git rebase -i HEAD~5 Rebase onto main (all commits since diverging) git rebase -i main 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
What does the git-workflows skill do?
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.
How do I install it?
Run `npx skills add BioTender-max/awesome-bio-agent-skills --skill git-workflows --agent claude-code` — it drops the skill into your project so the agent can pick it up. Swap the --agent value for codex, cursor or copilot if you use one of those.
Where does this skill come from?
From BioTender-max/awesome-bio-agent-skills, a repository with 144 stars. We read it straight from the repository tree rather than a submitted listing, so what you see here is what is actually published.
Is a popular skill a good skill?
Not necessarily. Stars measure attention, not adoption — a repository can trend for a week and be abandoned. That is why we show the weekly change from our own snapshots next to the total, instead of a single flattering number.