Menu
Git workflows, conventional commits, branching strategies, and PR management. Use for commits, branches, merges, rebases, and PR workflows.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
| name | git-workflow |
| description | Git workflows, conventional commits, branching strategies, and PR management. Use for commits, branches, merges, rebases, and PR workflows. |
| allowed-tools | Bash, Read |
| user-invocable | true |
Git workflows, conventional commits, branching strategies, and pull request management.
Format: <type>(<scope>): <description>
feat: New feature
fix: Bug fix
docs: Documentation only
style: Formatting, no code change
refactor: Code change, no feature/fix
perf: Performance improvement
test: Adding tests
chore: Build, config, dependencies
ci: CI/CD changes
revert: Revert previous commit
git commit -m "feat(auth): add OAuth2 login"
git commit -m "fix(api): handle null response"
git commit -m "docs: update README installation"
git commit -m "chore(deps): upgrade React to 19"
git commit -m "refactor(utils): simplify date formatting"
git commit -m "feat(api)!: change response format"
# or
git commit -m "feat(api): change response format
BREAKING CHANGE: Response now returns array instead of object"
<type>/<ticket>-<description>
git checkout -b feat/AUTH-123-oauth-login
git checkout -b fix/BUG-456-null-pointer
git checkout -b chore/upgrade-dependencies
git checkout -b hotfix/security-patch
feat/ Feature branch
fix/ Bug fix branch
hotfix/ Urgent production fix
chore/ Maintenance
docs/ Documentation
refactor/ Code refactoring
test/ Test additions
git checkout main
git pull origin main
git checkout -b feat/TICKET-123-feature-name
git add -A
git commit -m "feat(scope): description"
git push -u origin HEAD
gh pr create --title "feat(scope): description" --body "## Summary\n- Change 1\n- Change 2"
# Rebase (clean history)
git fetch origin
git rebase origin/main
# Or merge (preserves history)
git merge origin/main
git rebase -i HEAD~3 # Last 3 commits
# Change 'pick' to 'squash' or 's' for commits to combine
git add .
git commit --amend --no-edit # Keep same message
git commit --amend -m "new message" # Change message
git reset --soft HEAD~1 # Undo commit, keep changes staged
git reset --mixed HEAD~1 # Undo commit, keep changes unstaged
git reset --hard HEAD~1 # Undo commit, discard changes
git cherry-pick <commit-hash>
git cherry-pick <hash1> <hash2> # Multiple commits
git stash # Stash changes
git stash -m "description" # With message
git stash list # List stashes
git stash pop # Apply and remove
git stash apply # Apply and keep
git stash drop # Remove stash
git log --oneline -10 # Last 10 commits, compact
git log --oneline --graph --all # Visual branch graph
git log --since="1 week ago" # Last week
git log --author="name" # By author
git log --grep="fix" # Search message
git log -p # Show diffs
git log --stat # Show file changes
git diff # Unstaged changes
git diff --staged # Staged changes
git diff HEAD~3 # Last 3 commits
git diff main..feature # Between branches
git diff --name-only # Only file names
git tag v1.0.0 # Lightweight tag
git tag -a v1.0.0 -m "Release 1.0.0" # Annotated tag
git push origin v1.0.0 # Push tag
git push origin --tags # Push all tags
git tag -d v1.0.0 # Delete local tag
git push origin :refs/tags/v1.0.0 # Delete remote tag
git branch -d feature-branch # Delete merged branch
git branch -D feature-branch # Force delete branch
git remote prune origin # Clean stale remote refs
git gc # Garbage collect
[alias]
co = checkout
br = branch
ci = commit
st = status
lg = log --oneline --graph --all
last = log -1 HEAD
unstage = reset HEAD --
amend = commit --amend --no-edit
# Merge commit (preserves history)
git merge feature-branch
# Squash merge (single commit)
git merge --squash feature-branch
git commit -m "feat: feature description"
# Rebase merge (linear history)
git rebase main
git checkout main
git merge feature-branch --ff-only
git revert <commit-hash>
git push
git checkout main
# Or save changes:
git checkout -b new-branch
git reflog # Find commit hash
git checkout -b recovered-branch <hash>
git status # See conflicted files
# Edit files, resolve conflicts
git add <resolved-files>
git commit # Complete merge
MCP-first testing workflow for Xcode apps (iOS, iPadOS, macOS). Use when the user asks to build, test, run, or verify an Xcode project — including UI checks, smoke tests, regression tests, or simulator launches. Prefers Xcode MCP tools via mcpbridge; falls back to xcodebuild/simctl CLI when MCP is unavailable.
Look up Apple Developer Documentation (Swift, SwiftUI, HealthKit, UIKit, etc.) and WWDC session transcripts using the sosumi CLI tool. Use when working with Swift/iOS code and need to check API signatures, find documentation, or understand Apple frameworks.
Automate browser interactions using agent-browser CLI. Use for taking screenshots, testing deployed sites, checking mobile views, form testing, or browser automation tasks.
Generate user-friendly changelogs from git commits. Transforms technical commits into clear release notes.
Request and perform code reviews. Guidelines for reviewing code quality, finding bugs, and ensuring best practices.
Database management with Prisma ORM. Use for migrations, schema management, seeding, and database queries.