git-workflow
/git-workflow
Use when the user asks to "commit", "create PR", "branch", "merge", "rebase", "cherry-pick", "tag", or otherwise manage git history. Guides disciplined git operations — branching, commits, PRs, and recovery.
- Author
- arozumenko ↗
- Repository
- sdlc-skills ↗
- Licence
- MIT
- Last repository change
- 26.10.2026
Assessment and security
- Files in this package
- 3
- Scripts
- 0
- HTML comments
- 0
- URLs in SKILL.md
- 0
No signals detected. Repository changed on 26.10.2026, without references to retired models or APIs.
MIT, open: use and modify while retaining author attribution.
What it does and when to use it
Use when the user asks to "commit", "create PR", "branch", "merge", "rebase", "cherry-pick", "tag", or otherwise manage git history. Guides disciplined git operations — branching, commits, PRs, and recovery.
Triggers from the description
Original author description
Use when the user asks to "commit", "create PR", "branch", "merge", "rebase", "cherry-pick", "tag", or otherwise manage git history. Guides disciplined git operations — branching, commits, PRs, and recovery.
How it works
- Platform & systems
- Before Any Git Operation
- Branching
- Commits
- Pull Requests
- Dangerous Operations
- Recovery
SKILL.md preview
---
name: git-workflow
description: Use when the user asks to "commit", "create PR", "branch", "merge", "rebase", "cherry-pick", "tag", or otherwise manage git history. Guides disciplined git operations — branching, commits, PRs, and recovery.
license: Apache-2.0
compatibility: Requires git CLI; gh/glab/az/bb/tea for your host's PR/MR operations
allowed-tools: Bash(git:*) Bash(gh:*)
metadata:
authors:
- Artem Rozumenko <artem_rozumenko@epam.com>
version: "0.1.0"
---
# Git Workflow
Disciplined git operations for professional codebases.
## Platform & systems
Commands below use **GitHub `gh`** as the reference. Translate to your code host
per `.agents/workflow.md` § Git host — GitLab `glab`, Bitbucket `bb`, Azure
DevOps `az repos`, Gitea `tea`. "PR" means PR or MR. If scout hasn't recorded a
host, ask before assuming GitHub.
## Before Any Git Operation
```bash
git --no-pager status
git --no-pager log --oneline -5
git --no-pager diff --stat
```
Always know the current state before changing it.
## Branching
```bash
# Feature branch from main
git checkout main && git pull && git checkout -b feat/short-description
# Bug fix
git checkout main && git pull && git checkout -b fix/issue-description
```
Branch naming: `feat/`, `fix/`, `chore/`, `docs/` prefixes. Lowercase, hyphens, concise.
## Commits
**Never commit unless the user explicitly asks.** When they do:
1. Stage specific files (not `git add -A` — avoid secrets and binaries)
2. Write a message that explains *why*, not *what*
3. Keep commits focused — one concern per commit
```bash
git add src/auth.py src/middleware.py
git commit -m "$(cat <<'EOF'
Fix session expiry not respecting timezone offset
The previous check used naive datetime comparison which failed
for users in negative UTC offsets.
Co-Authored-By: Claude <noreply@anthropic.com>
EOF
)"
```
## Pull Requests
When asked to create a PR:
1. Check all commits since divergence: `git --no-pager log main..HEAD --oneline`
2. Review full diff: `git --no-pager diff main...HEAD`
3. Push with tracking: `git push -u origin HEAD`
4. Create with structured body:
```bash
gh pr create --title "Short title under 70 chars" --body "$(cat <<'EOF'
## Summary
- What changed and why (2-3 bullets)
## Test plan
- [ ] How to verify this works
Generated with Claude Code
EOF
)"
```
## Dangerous Operations
**Always confirm with the user before:**
- `git push --force` (any variant)
- `git reset --hard`
- `git branch -D`
- `git rebase` on shared branches
- `git checkout .` or `git restore .` (discards work)
**Never:**
- Skip hooks (`--no-verify`)
- Force push to main/master
- Amend published commits
- Use interactive flags (`-i`) — not supported in non-interactive shells
## Recovery
See `references/recovery.md` for common recovery scenarios.
Files in this package (3)
- README.md 1 KB
- SKILL.md 3 KB
- references/recovery.md 1 KB
Versions
| Repository | Score | Licence |
|---|---|---|
| This page · arozumenko/sdlc-skills | 100 | MIT |
| event4u-app/agent-config | 100 | MIT |
| lee-w/maigo | 100 | MIT |
| hakula139/plugins | 100 | MIT |
| ericrisco/rsc-harness | 100 | MIT |
| Sanit-mann/The-Insectoids | 100 | MIT |
| eliyce/paqad-ai | 100 | MIT |
| langfuse/langfuse | 100 | MIT |
| Muvon/octomind-tap | 100 | Apache-2.0 |
Identical content appears in 1 other GitHub folders. We show one copy with the highest score.
Database snapshot: 13.11.2026 · package version e189fa5e34ed (SHA-256 digest of the entire package)
Downloads in the last 30 days: 0 · ranking
Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.
Similar skills
- 100git
Advanced Git workflows skill. Branching models, merge vs rebase, interactive rebase, git bisect, cherry-pick, worktrees, commit conventions. Triggers on: /godmode:git, "branching strategy", "rebase vs merge", "git bisect", "cherry-pick". - 100git
Full git workflow for developers: status, staging, commits, branches, push/pull, merge/rebase, conflict resolution, stash, history (log/blame/bisect), remotes, tags, worktrees, cherry-pick, and recovery with reflog. The everyday operations live in the git tool; this skill covers… - 90git-merge
Complex git operations — merge conflict resolution, cherry-picks, rebases. Use when merging branches, resolving conflicts, cherry-picking commits, or rebasing. - 100git-workflows
Use when handling Git branches, commits, synchronization, merges, rebases, cherry-picks, conflict resolution, or repository recovery. - 100github-master
Expert Git & GitHub: workflows, history recovery, pull requests, branch protection, and Actions CI/CD. Trigger keywords: git, GitHub, merge conflict, rebase, cherry-pick, reflog, bisect, force push, pull request, branch protection, GitHub Actions, CI/CD, release, conventional… - 100git-conflict-resolve
[Git] Use when resolving git merge, cherry-pick, rebase or stash-apply conflicts, with backup and analysis.