one intelligent Git workflow assistants that streamline your development process:

• git-workflow: Topic-based branch management with safety checks and workflow guidance

• Intent Recognition: Intelligent mapping from natural language → Git commands
• Safety Guardrails: Three-stage checks (pre/during/post-execution) to prevent misoperations
• Context Awareness: Recommends appropriate actions based on current branch state
• Learning Assistance: Provides workflow guidance and problem diagnosis

Topic-based branch management with safety checks and workflow guidance.

Key Features: tnr/tn/tmg/td lifecycle | Three-stage safety checks | PR preparation | Advanced operations (fixup/amend) | Conflict resolution

→ Full Documentation

1. Git Aliases Configuration (Required for git-workflow):

   # Location: ./git/aliases.gitconfig
   # Contains core commands: tnr, tn, tmg, td, fixup, bdf, blg, etc.

2. Claude Code (Required):

   • Version: Supports Skills functionality
   • Configuration: ~/.claude/skills/ directory exists

3. Optional Dependencies:

   • fzf: Interactive selection (fixup, blf, pif)
   • ripgrep: Repository search (rg, rg-all)

Skills are deployed to:

~/.claude/skills/git-workflow/
├── SKILL.md
└── references/
    ├── git-topic-workflow.md
    ├── git-safety-mechanisms.md
    ├── git-pr-preparation.md
    ├── git-advanced-operations.md
    └── git-troubleshooting.md

Trigger rules added to:

~/.claude/skills/skill-rules.json

Verify Installation:

# Check git-workflow files
ls ~/.claude/skills/git-workflow/

# Verify trigger rules
grep -A 20 "git-workflow" ~/.claude/skills/skill-rules.json

git-workflow: Natural language commands for branch management

"开始新功能 user-auth" → Creates and pushes feature branch
"完成功能" → Merges and cleans up branch
"查看 branch diff" → Shows changes vs base branch

→ git-workflow Full Usage Guide

Combining both skills for a full development cycle:

# 1. Create branch (git-workflow)
You: "开始新功能 user-auth"
→ git tnr feature/user-auth

# 2. Save progress during development (git-workflow)
You: "临时保存"
→ git save "WIP: implementing login"

# 3. Check progress (git-workflow)
You: "查看我改了什么"
→ git bdf  # Diff
→ git blg  # Log

# 4. Modify history (git-workflow)
You: "修改之前的 commit"
→ git fixup  # fzf selection

# 5. merged on GitHub, cleanup (git-workflow)
You: "完成功能"
→ git tmg  # merge and delete branch

More Scenarios:

• git-workflow scenarios: Conflict resolution, misoperation recovery

Separation of Concerns:

• Skills Layer: Intent recognition, safety checks, guidance
• Aliases Layer: Git operations, runtime safety, error handling

YAGNI Approach:

• Don't rewrite aliases logic
• Focus on intelligent wrapping and context awareness

→ Full Architecture Documentation

Trigger rules are defined in ~/.claude/skills/skill-rules.json.

Example Keywords: "开始新功能", "完成功能", "git workflow", "branch diff", "fixup"

→ Complete Trigger Rules

Breakdown:

• git-workflow: 6 documents, 3620 lines

Goal: Validate core value - intent recognition + safety checks

Deliverables:

• ✅ SKILL.md
• ✅ git-topic-workflow.md
• ✅ git-safety-mechanisms.md
• ✅ skill-rules.json trigger rules

Validation Criteria:

• ✅ Can recognize 5 types of user intents
• ✅ State checks cover 4 dimensions
• ✅ Generate correct and safe commands

Goal: Add PR preparation, history modification, recovery guidance

Deliverables:

• ✅ git-pr-preparation.md
• ✅ git-advanced-operations.md
• ✅ git-troubleshooting.md

Validation Criteria:

• ✅ PR preparation checklist complete
• ✅ Fixup/amend guidance clear
• ✅ Conflict resolution workflow actionable
• ✅ Recovery solutions cover common misoperations

Goal: Improve based on actual usage feedback

Plan:

• Adjust trigger rules (based on effectiveness)
• Add more common scenarios
• Improve error messages
• Workflow visualization (if valuable)

git-workflow-skill/
├── README.md                    # This file (English)
├── README_zh-CN.md             # Chinese version
├── skills/
│   └── git-workflow/           # Git workflow skill
│       ├── SKILL.md
│       ├── references/
│       ├── docs/
│       │   ├── README.md       # Development documentation (English)
│       │   ├── README_zh-CN.md # Development documentation (Chinese)
│       │   └── testing.md
│       └── examples/scenarios.md
└── git/                         # Git aliases configuration
    ├── aliases.gitconfig
    └── Git-Aliases-Reference-Manual.md

git-workflow Skill:

1. Modify Main Document:

   vim skills/git-workflow/SKILL.md
   rsync -av --exclude 'docs/' --exclude 'examples/' skills/git-workflow/ ~/.claude/skills/git-workflow/

2. Modify Reference Documents:

   vim skills/git-workflow/references/<document>.md
   rsync -av --exclude 'docs/' --exclude 'examples/' skills/git-workflow/ ~/.claude/skills/git-workflow/

Trigger Rules:

1. Modify Trigger Rules:

   vim ~/.claude/skills/skill-rules.json
   # Modify keywords or intentPatterns for git-workflow

2. Verify Modifications:

   # JSON format check
   python3 -m json.tool ~/.claude/skills/skill-rules.json > /dev/null
   
   # Test triggers in Claude Code

Skills Not Triggering:

# Verify trigger rules
grep -E "git-workflow" ~/.claude/skills/skill-rules.json

# Verify skill files exist
ls ~/.claude/skills/git-workflow/

Git Aliases Not Found:

# Check if aliases are loaded
git config --get-regexp alias.tnr

# Verify aliases file
ls ./git/aliases.gitconfig

gh CLI Issues:

# Authenticate with GitHub
gh auth login

# Verify authentication
gh auth status

Detailed Troubleshooting:

• git-workflow troubleshooting: Trigger issues, command errors, state checks

MIT License

• Git Aliases: Local: git/aliases.gitconfig Github: https://github.com/appleshan/dotfiles/blob/stow/git/.config/git/conf/aliases.gitconfig
• Git Aliases Reference Manual: Local: git/Git-Aliases-Reference-Manual.md Github: https://github.com/appleshan/dotfiles/blob/stow/git/.config/git/conf/Git-Aliases-Reference-Manual.md

• Feature Branch Workflow: https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
• Git Flight Rules: https://github.com/k88hudson/git-flight-rules
• Oh Shit, Git!: https://ohshitgit.com/

If you have questions or suggestions:

1. Refer to the "Troubleshooting" section of this document
2. Consult the Skill documentation: ~/.claude/skills/git-workflow/SKILL.md
3. Check Git Aliases Reference Manual: git/Git-Aliases-Reference-Manual.md

Happy Coding! 🚀