القائمة
Use when working with git operations including commits, branches, worktrees, and PRs. Covers the full git workflow from feature isolation to PR submission.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
| name | git-expert |
| description | Use when working with git operations including commits, branches, worktrees, and PRs. Covers the full git workflow from feature isolation to PR submission. |
Expert git workflow skill covering isolation (worktrees), commits, branching, and PR submission using GitHub CLI (gh).
Core principles:
This skill contains three sub-skills for different phases:
Follow this priority:
# 1. Check existing directories
ls -d .worktrees 2>/dev/null # Preferred (hidden)
ls -d worktrees 2>/dev/null # Alternative
# 2. Check CLAUDE.md for preference
grep -i "worktree.*director" CLAUDE.md 2>/dev/null
# 3. If neither exists, ask user
MUST verify directory is ignored before creating worktree:
git check-ignore -q .worktrees 2>/dev/null
If NOT ignored:
echo '.worktrees/' >> .gitignore# 1. Get project name
project=$(basename "$(git rev-parse --show-toplevel)")
# 2. Create worktree with new branch
git worktree add .worktrees/$BRANCH_NAME -b feature/$BRANCH_NAME
# 3. Move to worktree
cd .worktrees/$BRANCH_NAME
# 4. Auto-detect and run setup
if [ -f package.json ]; then npm install; fi
if [ -f Cargo.toml ]; then cargo build; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f go.mod ]; then go mod download; fi
# 5. Verify clean baseline
npm test # or project-appropriate test command
| Command | Purpose |
|---|---|
git worktree add <path> -b <branch> | Create new worktree with branch |
git worktree list | List all worktrees |
git worktree remove <path> | Remove worktree |
git worktree prune | Clean up stale references |
Never do without explicit permission:
git clean -fdxAlways do:
# 1. Status check
git status
# 2. Pre-commit validation (if available)
npm run lint && npm run typecheck
# 3. Run tests
npm test
# 4. Review changes
git diff --cached
Format: {type}: {summary}
Types:
feat: New featurefix: Bug fixrefactor: Code restructuringdocs: Documentationstyle: Formattingtest: Testsbuild: Build systemchore: MaintenanceExamples:
git commit -m "feat: add user profile endpoint"
git commit -m "fix: resolve race condition in auth flow"
git commit -m "refactor: extract validation helpers"
Use HEREDOC for complex messages:
git commit -m "$(cat <<'EOF'
feat: implement retry mechanism for API calls
- Add exponential backoff with jitter
- Configure max retries via environment variable
- Add comprehensive test coverage
Closes #123
EOF
)"
# See what's staged
git diff --cached --name-only
# See what's unstaged
git diff --name-only
# Stage related files together
git add src/auth/* tests/auth/*
# Stage hunks interactively (if needed)
git add -p
MANDATORY before every commit:
# 1. Run tests
npm test # Must pass
# 2. Run linter
npm run lint # Must be clean
# 3. Type check (if applicable)
npm run typecheck # Must pass
# 4. Review staged changes
git diff --cached
npm test # Must pass before proceeding
If tests fail, stop. Fix before continuing.
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master
Implementation complete. What would you like to do?
1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work
Which option?
git checkout main
git pull
git merge feature/my-feature
npm test # Verify after merge
git branch -d feature/my-feature
Then cleanup worktree.
git push -u origin feature/my-feature
gh pr create --title "Add feature X" --body "$(cat <<'EOF'
## Summary
- Implemented X
- Added tests for Y
## Test Plan
- [ ] Unit tests pass
- [ ] Integration tests pass
EOF
)"
Report status. Don't cleanup.
Require confirmation:
This will permanently delete:
- Branch feature/my-feature
- All commits: abc123, def456
- Worktree at .worktrees/my-feature
Type 'discard' to confirm.
git checkout main
git branch -D feature/my-feature
git worktree remove .worktrees/my-feature
| Type | Pattern | Example |
|---|---|---|
| Feature | feature/description | feature/user-auth |
| Bug fix | fix/description | fix/login-redirect |
| Refactor | refactor/description | refactor/auth-module |
| Personal | dev/name/description | dev/erik/auth-poc |
main / master: Production (never direct push)develop / dev: Development/stagingAlways create feature branches from the appropriate base.
.worktrees/ is in .gitignoreNever:
Always:
# Worktree setup
git worktree add .worktrees/feature -b feature/name
cd .worktrees/feature && npm install && npm test
# Commit workflow
git status
npm test && npm run lint
git add <files>
git commit -m "type: description"
# Standard PR
git push -u origin feature/name
gh pr create
# Cleanup
git worktree remove .worktrees/feature
git branch -d feature/name
On-demand loading: This is a Domain skill, loaded when git operations detected.
Pairs with:
Complete PR submission pipeline with local sub-agent review before pushing, CI verification, and automated review integration. Always dispatches code-reviewer and code-simplifier for code changes, plus conditional reviewers (security, performance, dependency, accessibility, i18n, type-design, etc.) based on change type. Waits for CI with `gh pr checks --watch`. Integrates CodeRabbit and Greptile feedback.
GitHub CLI patterns for PR reviews, comments, and API operations. Use when working with gh api commands, especially for review threads and comments.
Use when following a written plan or task list. Checkpoint verification at each step. Triggers - execute plan, follow plan, implement plan, next step, continue, proceed.
Use for parallel branch development with workspace isolation.
Use when implementing analytics, event tracking, or setting up dashboards. Covers privacy-first tracking, event patterns, and common analytics tools.
REST/GraphQL API design patterns, error handling, and versioning. Use when designing APIs, handling errors, or making API architecture decisions.