stefandevo/skills/git-master
skills/git-master/SKILL.md
# 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 --force` - `git reset --hard` - `git rebase` on shared branches - Any history-rewriting operation **ALWAYS**: - Check current branch before operations - Ve
$ install --global
skillsauthnpx skillsauth add stefandevo/oh-my-claude skills/git-masterInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 21, 2026, 6:10 PM161.9s1 file scanned
SKILL.md
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
stefandevo/skills/start-work
testing
VerifiedTrustedCommunity
# Start Work Skill Begins execution of a work plan using Sisyphus orchestration. ## Trigger - `/start-work` - Start work on active/most recent plan - `/start-work <plan-name>` - Start work on specific plan ## Instructions When this skill is invoked: ### 1. Load the Plan If no plan name specified: 1. Check `.sisyphus/boulder.json` for active plan 2. If no active plan, list plans in `.sisyphus/plans/` 3. Use most recent if only one, otherwise ask user Read the plan from `.sisyphus/plans/{n
7SKILL.mdUpdated Apr 21, 2026
stefandevo/skills/plan
development
VerifiedTrustedCommunity
# Plan Skill Activates Prometheus planning mode for structured requirement gathering and plan creation. ## Trigger - `@plan <topic>` - Start planning session for a topic - `/plan <topic>` - Alternative trigger ## Instructions When this skill is invoked: ### 1. Enter Planning Mode You are now **Prometheus** - a planner, not an implementer. **CRITICAL**: You do NOT write code. You create work plans. ### 2. Create Draft Create a planning draft at `.sisyphus/drafts/{topic}.md`: ```markdow
7SKILL.mdUpdated Apr 21, 2026
stefandevo/skills/frontend-ui-ux
development
VerifiedTrustedCommunity
# Frontend UI/UX Skill Specialized skill for creating beautiful, functional user interfaces. ## Trigger - When delegated UI/frontend work - Explicit frontend tasks - Visual design requests ## Instructions When this skill is invoked, you are a **Frontend Engineer** specializing in: - Beautiful, modern aesthetics - Functional, accessible interfaces - Performant, responsive designs ### Design Philosophy #### Visual Excellence - Clean, modern aesthetics - Thoughtful whitespace - Consistent vi
7SKILL.mdUpdated Apr 21, 2026
steipete/skill-creator
testing
VerifiedTrustedCommunity
Create, edit, improve, or audit AgentSkills. Use when creating a new skill from scratch or when asked to improve, review, audit, tidy up, or clean up an existing skill or SKILL.md file. Also use when editing or restructuring a skill directory (moving files to references/ or scripts/, removing stale content, validating against the AgentSkills spec). Triggers on phrases like "create a skill", "author a skill", "tidy up a skill", "improve this skill", "review the skill", "clean up the skill", "audit the skill".
356,423SKILL.mdUpdated Apr 13, 2026