Our review
This skill handles advanced git operations such as branch management, merge conflict resolution, history manipulation, and recovery patterns.
Strengths
- Automates complex git workflows with precise commands and safety checks.
- Includes a dangerous operations checklist to prevent accidental data loss.
- Covers a wide range of tasks: rebase, stash, bisect, worktree, and recovery.
Limitations
- Requires explicit user confirmation before destructive commands, which may interrupt flow.
- Some operations (e.g., bisect) are interactive and require user input.
- Lacks native support for platform-specific git hosting features (e.g., PR comments) beyond basic `gh` usage.
When to use it
Use for any advanced git operation where you need automated guidance and safety guardrails.
When not to use it
Avoid for simple daily git tasks (add/commit/push) as the extra safeguarding may be overkill.
Security analysis
CautionQuality score92/100
The skill contains commands that can rewrite history or discard local changes, which could cause data loss if used carelessly. However, it explicitly states to never run destructive commands without user confirmation and includes safety checklists. It does not instruct any malicious actions like exfiltrating secrets or running arbitrary scripts.
Findings
- •Skill instructs potentially destructive git operations (force push, hard reset, rebase) even though it includes safety warnings and user confirmation requirements.
- •No network exfiltration or code execution beyond standard git operations.
Examples
Squash last three commits
Squash the last three commits into one with a combined commit message.Recover deleted branch
I accidentally deleted a branch called 'feature/new-login'. Can you help me recover it using reflog?Resolve merge conflict
I have a merge conflict in 'src/app.ts' after rebasing. Walk me through resolving it and continuing the rebase.Git Master Skill
Advanced git operations and workflow management.
Trigger
- Complex git operations
- Branch management
- Merge conflict resolution
- Git history manipulation
Instructions
When this skill is invoked, you handle advanced git workflows.
Safety First
NEVER run without explicit user confirmation:
git push --forcegit reset --hardgit rebaseon shared branches- Any history-rewriting operation
ALWAYS:
- Check current branch before operations
- Verify remote status
- Create backup branches for risky operations
Common Operations
Clean Commit History
# Interactive rebase for cleaning commits
git rebase -i HEAD~n
# Squash commits
git reset --soft HEAD~n
git commit -m "Combined commit message"
Branch Management
# Create and switch to new branch
git checkout -b feature/name
# Update branch with latest main
git fetch origin
git rebase origin/main
# Clean up merged branches
git branch --merged | grep -v "main\|master" | xargs git branch -d
Conflict Resolution
- Identify conflicts:
git status - Open conflicted files
- Choose correct resolution
- Stage resolved files:
git add <file> - Continue:
git rebase --continueorgit merge --continue
Undo Operations
# Undo last commit (keep changes)
git reset --soft HEAD~1
# Undo last commit (discard changes)
git reset --hard HEAD~1
# Undo a specific commit (creates new commit)
git revert <commit-hash>
# Recover deleted branch
git reflog
git checkout -b recovered-branch <commit-hash>
Commit Message Guidelines
<type>(<scope>): <subject>
<body>
<footer>
Types:
feat: New featurefix: Bug fixrefactor: Code restructuringdocs: Documentationtest: Testschore: Maintenance
Example:
feat(auth): add JWT token refresh
Implement automatic token refresh when access token
expires. Refresh happens 5 minutes before expiration.
Closes #123
PR Workflow
# Update feature branch
git fetch origin
git rebase origin/main
# Push (with lease for safety)
git push --force-with-lease
# Create PR
gh pr create --title "feat: description" --body "..."
Stash Operations
# Stash with message
git stash push -m "WIP: feature description"
# List stashes
git stash list
# Apply specific stash
git stash apply stash@{n}
# Pop and delete
git stash pop
Bisect for Bug Finding
# Start bisect
git bisect start
# Mark current as bad
git bisect bad
# Mark known good commit
git bisect good <commit>
# Test each commit, mark good/bad
git bisect good # or git bisect bad
# End bisect
git bisect reset
Worktree for Parallel Work
# Create worktree for different branch
git worktree add ../project-hotfix hotfix-branch
# List worktrees
git worktree list
# Remove worktree
git worktree remove ../project-hotfix
Recovery Patterns
Lost Commits
# Find in reflog
git reflog
# Cherry-pick or checkout
git cherry-pick <commit>
Corrupted Repository
# Verify integrity
git fsck --full
# Recover from remote
git fetch origin
git reset --hard origin/main
Best Practices
- Commit Often: Small, focused commits
- Write Good Messages: Future you will thank you
- Branch Per Feature: Keep main clean
- Rebase Before PR: Clean history
- Never Force Push Main: Protect shared branches
- Use Tags for Releases:
git tag -a v1.0.0 -m "Release 1.0.0"
Dangerous Operations Checklist
Before running destructive commands:
- [ ] On correct branch?
- [ ] Have backup/can recover?
- [ ] Others affected?
- [ ] User explicitly confirmed?
Related skills
Next.js App Router Expert
Development
A skill that turns Claude into a Next.js App Router expert.
Claude CodeCursoradvanced
890
234
2,846
README Generator
Development
Creates professional and comprehensive README.md files for your projects.
claudeCursorWindsurfbeginner
259
72
821
API Documentation Writer
Development
Generates comprehensive API documentation in OpenAPI/Swagger format.
claudeCursorWindsurfintermediate
156
44
682