Git workflow

Skill arozumenko/wikis/.github/skills/git-workflow

Git operations, branching, commits, PRs, and release workflows. Use when the user asks to "commit", "create PR", "branch", "merge", "rebase", "cherry-pick", "tag", or manage git history.From its SKILL.md

Install

npx -y skills add arozumenko/wikis --skill git-workflow

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

6 stars6 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its file declares

Copied from the file, not written here

The file declares its own license as Apache-2.0. That is the author’s claim about this one file, and it is not the same thing as the license GitHub reports for the repository, which is listed with the other numbers below.

SKILL.md

2.3 KB, as published. Nobody here has run it

Git Workflow

Disciplined git operations for professional codebases.

Before Any Git Operation

git --no-pager status
git --no-pager log --oneline -5
git --no-pager diff --stat

Always know the current state before changing it.

Branching

# 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:

Stage specific files (not git add -A — avoid secrets and binaries)
Write a message that explains why, not what
Keep commits focused — one concern per commit

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 <[email protected]>
EOF
)"

Pull Requests

When asked to create a PR:

Check all commits since divergence: git --no-pager log main..HEAD --oneline
Review full diff: git --no-pager diff main...HEAD
Push with tracking: git push -u origin HEAD
Create with structured body:

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.