
claude-flow
Git workflow commands and the Will Haacket agent - a modern take on GitHub Flow aliases
Install
/plugin install claude-flow@claude-flowRun it inside Claude Code after adding the marketplace with /plugin marketplace add poindexter12/claude-flow.
Contents
Discovered from sourceSkills 2
Branch Naming Skill
Generate consistent, readable branch names from descriptions.
Prefixes align with the conventional-commit skill types for a unified workflow.
Format
[prefix/]short-descriptive-name
Prefixes
Match conventional commit types for consistency:
| Prefix | Commit Type | Use When |
|---|---|---|
feat/ | feat: | New functionality |
fix/ | fix: | Bug fixes |
docs/ | docs: | Documentation only |
style/ | style: | Formatting, no code change |
refactor/ | refactor: | Code restructuring |
perf/ | perf: | Performance improvements |
test/ | test: | Adding/fixing tests |
chore/ | chore: | Maintenance, deps, config |
Use a prefix when the intent is clear. Skip it if ambiguous.
Rules
- Kebab-case: lowercase, hyphens between words (
add-user-auth) - Short: 3-5 words max, under 50 chars total
- Descriptive: what it does, not how (
add-searchnotimplement-elasticsearch) - No fluff: drop articles and filler (
user-profilenotthe-user-profile-page) - No ticket numbers alone:
fix/login-timeoutnot justJIRA-1234
Examples
| Description | Branch Name |
|---|---|
| "Add user authentication" | feat/add-user-auth |
| "Fix the login timeout bug" | fix/login-timeout |
| "Update README with install instructions" | docs/update-readme |
| "Refactor the payment processing module" | refactor/payment-processing |
| "Bump lodash to fix security issue" | chore/bump-lodash |
| "Quick experiment with caching" | try-caching |
Edge Cases
- Ticket numbers: Include after prefix if team uses them:
feat/PROJ-123-add-search - Uncertain scope: Skip prefix, use descriptive name:
improve-performance - Spikes/experiments: Use
try-orspike-prefix:try-redis-caching
Commit Message Generator
Generate commit messages following Conventional Commits by analyzing actual code changes.
Resources
references/conventional-commits-summary.md- Types, examples, quick referencereferences/conventional-commits-spec.md- Full v1.0.0 specification (16 rules)assets/commit.template- Git commit template (user can configure withgit config commit.template)
Process
- Run
git statusto see what files changed - Run
git diff --cached(staged) orgit diff(unstaged) to see actual changes - Analyze the diff to understand what was done
- Generate a commit message using Conventional Commits format (see
references/conventional-commits-summary.md)
Guidelines
- Read the diff, don't ask the user to describe it
- Pick the type based on what the change does, not what files changed
- Use scope when the change is clearly in one area
- If multiple unrelated changes, suggest splitting the commit
- Match the project's existing commit style if they have one
Related
The branch-naming skill uses matching prefixes (feat/, fix/, etc.) for a unified workflow.
Commands 7
Clean Merged Branches
Remove local branches that have already been merged into the default branch.
Instructions
-
Get the default branch name:
git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' -
Delete local branches that have been merged (excluding current and default):
git branch --merged | grep -v "\*" | grep -v "<DEFAULT_BRANCH>" | xargs -n 1 git branch -d -
Report which branches were deleted, or if none were found.
Branch Done
Complete the current branch workflow after a PR has been merged.
Instructions
-
Get the default branch name:
git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' -
Checkout the default branch and pull latest:
git checkout <DEFAULT_BRANCH> && git pull --rebase --prune -
Delete local branches that have been merged into the default branch:
git branch --merged | grep -v "\*" | grep -v "<DEFAULT_BRANCH>" | xargs -n 1 git branch -d -
Report which branches were cleaned up, or if none were found.
Save Progress
Create a quick savepoint commit with all current changes. Use this when you want to preserve your current state but aren't ready for a proper commit.
Instructions
-
Stage all changes and commit:
git add -A && git commit -m "save: <MESSAGE>"Where
<MESSAGE>is the user's message argument, or "checkpoint" if none provided. -
Report the result to the user.
Start Feature Branch
Create and switch to a new feature branch after syncing with the default branch.
Instructions
-
Determine the branch name:
- If no input provided: Ask the user what they're working on
- If input looks like a branch name (kebab-case, no spaces): Use it directly
- If input is a description: Use the
branch-namingskill to generate a name, then confirm with the user
-
Get the default branch name:
git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' -
Checkout the default branch, pull latest, then create the new feature branch:
git checkout <DEFAULT_BRANCH> && git pull --rebase --prune && git checkout -b <BRANCH_NAME> -
Report the result to the user.
Sync Branch
Update the current branch with latest changes from remote.
Instructions
-
Pull with rebase and prune stale remote branches:
git pull --rebase --prune -
If the repo has submodules, update them:
git submodule update --init --recursive -
Report the result to the user.
Undo Last Commit
Reset the last commit but preserve all changes in the working directory. This is safe - your work is not lost.
Instructions
-
Reset the last commit while keeping changes unstaged:
git reset HEAD~1 --mixed -
Report the result to the user, showing what was undone.
Work In Progress
Commit only tracked (already staged or modified) files as a WIP commit. Unlike save, this doesn't add untracked files.
Instructions
-
Commit tracked changes:
git commit -am "wip: work in progress" -
Report the result to the user. If nothing to commit, let them know.
Agents 1
Will Haacket
You are Will Haacket, a git workflow assistant. You handle the interactive git tasks that need judgment - reviewing changes, writing commit messages, and deciding what to do next.
Personality
- Direct and efficient
- Don't over-explain git basics
- Just get the job done
What You Do
- Review changes: Show diffs, explain what changed in plain english
- Commit with good messages: Read the diff, write a meaningful commit message, execute
- Push to remote: Push current branch, set upstream if needed
- Advise on workflow: Suggest the right flow command for the situation
What You Don't Do
For these, tell the user which command to run:
/flow:start <branch>- start a new feature branch/flow:sync- pull with rebase and prune/flow:save [msg]- quick savepoint/flow:wip- WIP commit/flow:undo- undo last commit/flow:done- complete branch workflow/flow:clean- delete merged branches
Core Workflow: Commit and Push
When the user says "commit", "commit and push", or similar:
- Run
git statusto show what's changed - Run
git diff(orgit diff --cachedif staged) to understand changes - Use the
conventional-commitskill to generate a commit message - Show the proposed message, ask for confirmation
- Execute:
git add -A && git commit -m "<message>" - If pushing:
git push -u origin HEAD
Core Workflow: What Changed
When user asks what changed:
git status- list filesgit diff- show actual changes- Summarize in plain english: what was added, modified, removed, and why it matters
Guidelines
- Always show
git statusfirst - Read the diff to write commit messages - don't ask the user to describe it
- Before pushing, confirm the branch name
- If the user should use a flow command instead, tell them which one
Hooks 1
Sponsors
Details
- Marketplace
- poindexter12/claude-flow
- Source
- poindexter12/claude-flow
- Category
- Community