git-workflow
Skill1 starsChanged 6 months agoMITView on GitHub
Use when the user wants Git workflow help around committing, rebasing, creating linked worktrees, bootstrapping a worktree environment, or cleaning up branches/worktrees. Covers smart conventional commits, grouping changes into focused commits, safe rebases, linked worktree setup under .worktrees, optional environment reuse through symlinks, branch cleanup, and safe local branch deletion without destructive reset operations.
188 other projects use a version of this.
Adopted by
Most recently taken up by
- Rojios/everything-claude-codetheir own version, first seen Nov 8, 2026
- kinhluan/skillstheir own version, first seen Nov 8, 2026
- juninmd/skillstheir own version, first seen Nov 8, 2026
- jDxve/avengers-kittheir own version, first seen Nov 8, 2026
- lhbsaa/apex-unifiedtheir own version, first seen Nov 8, 2026
- haythamasalama/skillstheir own version, first seen Nov 8, 2026
Used with
Projects with it also use squad-commands, ci-cd-pipelines and 10 more.
Other files people use alongside this one.
Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
Microsoft AzureSkillsquad-commands
Categorized catalog of common Squad operations. Coordinator reads this file and presents it as an interactive menu when the user asks for available commands or help.
Also in 5 projects that use this
harrissohail6Skillci-cd-pipelines
CI/CD pipeline design and implementation. Auto-activates when discussing deployment, automation, or pipelines.
Also in 6 projects that use this
- Microsoft AzureSkill
architectural-proposals
How to write comprehensive architectural proposals that drive alignment before code is written
Also in 4 projects that use this
GitHubSkille2e-template-testing
End-to-end validation of coordinator and agent template changes
Also in 3 projects that use this
- GitHubSkill
notification-routing
Route agent notifications to specific channels by type — prevent alert fatigue from single-channel flooding
Also in 3 projects that use this
frostneySkillnative-nostalgia-stack
Applies the user's FreePascal toolchain and its build, formatting, hook, and test contracts while leaving project-specific mechanics local. Use when scaffolding or working in a FreePascal project that follows this toolchain.
Also in 3 projects that use this
- +5 more from Azure
- +1 more from github
Other versions188 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 188
- langfuse/langfuse★ 37ksame name
- modelcontextprotocol/typescript-sdk★ 14ksame name
- JetBrains/ideavim★ 10ksame name
- jokob-sk/NetAlertX★ 7.4ksame name
- netalertx/NetAlertX★ 7.4ksame name
- Galaxy-Dawn/claude-scholar★ 5.9ksame name
- github/gh-aw★ 5.6ksame name
- modelcontextprotocol/csharp-sdk★ 4.6ksame name
- antonbabenko/pre-commit-terraform★ 3.8ksame name
- github/squad★ 3.4ksame name
178 more not listed
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository4 other files it gives its agents.
- AGENTS.mdAGENTS.md
- agent-context-filesSkill
- cloudflare-dns-managerSkill
- gitlab-mrSkill
The file
Show its rules and text
We split this skill into the rules it gives an agent
22 rules. 0 are common, 17 are distinctive, and 5 are very specific to this project.
0
Common
Most of the 165 edited versions we read keep these.
17
Distinctive
This author's own choices. Worth a look.
5
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Distinctive: line 14
Use this skill for three common Git tasks:
- Distinctive: line 23
Use this when the user asks to commit changes, create a good commit message, or split changes into multiple commits.
- Distinctive: line 25
Read references/git-commit.md and follow it.
- Distinctive: line 30
Prefer several focused commits over one large mixed commit.
- Distinctive: line 32
If hooks modify files or fail, re-check status, re-add files, and retry.
- Very specific: line 36
Use this when the user asks to clean up a branch, remove a worktree, return to develop/main, or delete a finished local branch.
- Distinctive: line 38
Read references/git-cleanup.md and follow it.
- Distinctive: line 43
Stop if there are uncommitted changes.
- Distinctive: line 44
Never delete the target branch.
- Distinctive: line 45
Only delete local branches.
- Distinctive: line 46
Never use destructive reset or checkout operations.
- Very specific: line 50
Use this when the user asks to create a linked worktree, start feature work away from main/develop, or bootstrap a worktree environment.
- Distinctive: line 52
Read references/git-worktree.md and follow it.
- Very specific: line 57
Prefer linked worktrees under the repository root at .worktrees/<branch-slug>.
- Very specific: line 58
Prefer creating a feature branch from the requested base branch rather than editing directly on main or develop.
- Distinctive: line 61
Never overwrite existing non-symlink files while bootstrapping.
- Very specific: line 65
Use this when the user asks to rebase the current branch onto develop/main, sync a feature branch with the latest base branch, or rewrite …
- Distinctive: line 67
Read references/git-rebase.md and follow it.
- Distinctive: line 72
Stop if there are uncommitted changes unless the user explicitly asked for a stash-based flow.
- Distinctive: line 73
Prefer git fetch --prune before rebasing onto the latest remote-tracking target branch.
- Distinctive: line 74
Default to safe non-interactive rebase.
- Distinctive: line 75
If conflicts occur, report the conflicted files and current rebase state clearly.
“Common” is measured: kept by at least 6 in 10 of the 165 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Git Workflow
Use this skill for three common Git tasks:
- Smart commits for current changes
- Rebase of the current branch onto a base branch
- Linked worktree creation and environment bootstrap
- Cleanup of a finished branch or linked worktree
Commit Workflow
Use this when the user asks to commit changes, create a good commit message, or split changes into multiple commits.
Read references/git-commit.md and follow it.
Key expectations:
- Analyze actual current changes before naming commits.
- Prefer several focused commits over one large mixed commit.
- Use Conventional Commits.
- If hooks modify files or fail, re-check status, re-add files, and retry.
Cleanup Workflow
Use this when the user asks to clean up a branch, remove a worktree, return to develop/main, or delete a finished local branch.
Read references/git-cleanup.md and follow it.
Key expectations:
- Inspect whether the current directory is a normal worktree or linked worktree.
- Stop if there are uncommitted changes.
- Never delete the target branch.
- Only delete local branches; do not delete remotes.
- Never use destructive reset or checkout operations.
Worktree Workflow
Use this when the user asks to create a linked worktree, start feature work away from main/develop, or bootstrap a worktree environment.
Read references/git-worktree.md and follow it.
Key expectations:
- Confirm the repository root, current branch, linked-worktree status, and uncommitted changes before creating or entering a worktree.
- Prefer linked worktrees under the repository root at
.worktrees/<branch-slug>. - Prefer creating a feature branch from the requested base branch rather than editing directly on
mainordevelop. - Offer environment reuse by symlinking common local-only assets from the main worktree.
- Respect a no-reuse option when the user wants isolation or the project cannot safely share dependencies.
- Never overwrite existing non-symlink files while bootstrapping.
Rebase Workflow
Use this when the user asks to rebase the current branch onto develop/main, sync a feature branch with the latest base branch, or rewrite branch history in a simple linear way.
Read references/git-rebase.md and follow it.
Key expectations:
- Inspect the current branch, target branch, and working tree state before rebasing.
- Stop if there are uncommitted changes unless the user explicitly asked for a stash-based flow.
- Prefer
git fetch --prunebefore rebasing onto the latest remote-tracking target branch. - Default to safe non-interactive rebase; only use interactive rebase when the user explicitly asks for it.
- If conflicts occur, report the conflicted files and current rebase state clearly.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.