Skip to content
git logo

Git Operations

git

Git operations with conventional commits. Use for staging, committing, pushing, PRs, merges. Auto-splits commits by type/scope. Security scans for secrets.

SKILL.md

Full skill instructions

Git Operations

Execute git workflows via git-manager subagent to isolate verbose output. Activate context-engineering skill.

IMPORTANT:

  • Sacrifice grammar for the sake of concision.
  • Ensure token efficiency while maintaining high quality.
  • Pass these rules to subagents.

Arguments

  • cm: Stage files & create commits
  • cp: Stage files, create commits and push
  • pr: Create Pull Request [to-branch] [from-branch]
    • to-branch: Target branch (default: main)
    • from-branch: Source branch (default: current branch)
  • merge: Merge [to-branch] [from-branch]
    • to-branch: Target branch (default: main)
    • from-branch: Source branch (default: current branch)

Quick Reference

TaskReference
Commitreferences/​workflow-commit.md
Pushreferences/​workflow-push.md
Pull Requestreferences/​workflow-pr.md
Mergereferences/​workflow-merge.md
Standardsreferences/​commit-standards.md
Safetyreferences/​safety-protocols.md
Branchesreferences/​branch-management.md
GitHub CLIreferences/​gh-cli-guide.md

Core Workflow

Step 1: Stage + Analyze

git add -A && git diff --cached --stat && git diff --cached --name-only

Step 2: Security Check

Scan for secrets before commit:

git diff --cached | grep -iE "(api[_-]?key|token|password|secret|credential)"

If secrets found: STOP, warn user, suggest .gitignore.

Step 3: Split Decision

NOTE:

  • Search for related issues on GitHub and add to body.
  • Only use feat, fix, or perf prefixes for files in .claude directory (do not use docs).

Split commits if:

  • Different types mixed (feat + fix, code + docs)
  • Multiple scopes (auth + payments)
  • Config/​deps + code mixed
  • FILES > 10 unrelated

Single commit if:

  • Same type/​scope, FILES ≤ 3, LINES ≤ 50

Step 4: Commit

git commit -m "type(scope): description"

Output Format

✓ staged: N files (+X/​-Y lines)
✓ security: passed
✓ commit: HASH type(scope): description
✓ pushed: yes/​no

Error Handling

ErrorAction
Secrets detectedBlock commit, show files
No changesExit cleanly
Push rejectedSuggest git pull --rebase
Merge conflictsSuggest manual resolution

References

  • references/​workflow-commit.md - Commit workflow with split logic
  • references/​workflow-push.md - Push workflow with error handling
  • references/​workflow-pr.md - PR creation with remote diff analysis
  • references/​workflow-merge.md - Branch merge workflow
  • references/​commit-standards.md - Conventional commit format rules
  • references/​safety-protocols.md - Secret detection, branch protection
  • references/​branch-management.md - Naming, lifecycle, strategies
  • references/​gh-cli-guide.md - GitHub CLI commands reference