Complete guide to Git workflows and version control within Claude Code.
From claude-code-expertnpx claudepluginhub markus41/claude --plugin claude-code-expertThis skill uses the workspace's default tool permissions.
Searches, retrieves, and installs Agent Skills from prompts.chat registry using MCP tools like search_skills and get_skill. Activates for finding skills, browsing catalogs, or extending Claude.
Searches prompts.chat for AI prompt templates by keyword or category, retrieves by ID with variable handling, and improves prompts via AI. Use for discovering or enhancing prompts.
Implements Clean Architecture in Android and Kotlin Multiplatform projects: module layouts, dependency rules, UseCases, Repositories, domain models, and data layers with Room, SQLDelight, Ktor.
Complete guide to Git workflows and version control within Claude Code.
Claude Code automatically detects Git repositories and understands:
When asked to commit, Claude follows this exact workflow:
Inspect state (parallel):
git status — see untracked/modified filesgit diff — see staged and unstaged changesgit log --oneline -5 — recent commit styleDraft commit message:
Stage and commit (parallel):
git add <specific files> — never git add -A or git add .git commit -m "message" using heredoc for formattinggit status to verifytype(scope): description
Optional body with more details.
https://claude.ai/code/session_xxx
Types: feat, fix, refactor, test, docs, chore, style, perf, ci
When asked to create a PR, Claude:
gh pr create --title "feat: add user authentication" --body "$(cat <<'EOF'
## Summary
- Add JWT-based authentication middleware
- Create login/register API endpoints
- Add auth guards to protected routes
## Test plan
- [ ] Unit tests for auth middleware
- [ ] Integration tests for login/register
- [ ] E2E test for protected routes
https://claude.ai/code/session_xxx
EOF
)"
# View PR
gh pr view 123
# View PR comments
gh api repos/owner/repo/pulls/123/comments
# View PR checks
gh pr checks 123
# Merge PR
gh pr merge 123
# Close PR
gh pr close 123
# Create and checkout branch
git checkout -b feature/my-feature
# Push with upstream tracking
git push -u origin feature/my-feature
# Delete branch (local)
git branch -d feature/my-feature
# Delete branch (remote)
git push origin --delete feature/my-feature
Claude can help resolve merge conflicts:
# Start merge/rebase
git merge main
# or
git rebase main
# Claude reads conflict markers
# Claude resolves conflicts using Edit tool
# Claude stages resolved files
git add <resolved-file>
git merge --continue
# or
git rebase --continue
Claude follows strict git safety:
--no-verify (investigate hook failures instead)-i flag (interactive mode not supported)git add .)# Stash changes
git stash
# Stash with message
git stash push -m "work in progress on auth"
# Apply and remove
git stash pop
# Apply but keep in stash
git stash apply
# List stashes
git stash list
# Recent commits
git log --oneline -10
# Commits by author
git log --author="name"
# Changes between branches
git log main..feature-branch
# Diff between branches
git diff main...HEAD
# File history
git log --follow -p -- path/to/file
1. Make changes
2. Run tests: npm test
3. Run linter: npm run lint
4. Stage files: git add specific-files
5. Commit with message
# Update feature branch with main
git fetch origin main
git rebase origin/main
# If conflicts:
# Resolve → git add → git rebase --continue
git cherry-pick <commit-sha>
# Soft reset (keep changes staged)
git reset --soft HEAD~1
# Mixed reset (keep changes unstaged)
git reset HEAD~1
# Hard reset (DESTRUCTIVE - Claude confirms first)
git reset --hard HEAD~1