A structured checklist approach to the git operations where forgetting a step actually costs you time. Covers PR prep with commit history analysis, safe branch cleanup commands that won't nuke your work, merge conflict triage, monorepo tagging conventions, and the gitignore-before-first-commit pattern that everyone learns the hard way. The PR workflow is especially practical since it generates descriptions from actual diffs rather than vibes. Best used when you want Claude to walk through these multi-step processes methodically instead of jumping straight to commands. The conflict resolution guidance leans pragmatic, including the "extract and reapply manually" escape hatch for when rebase hell isn't worth it.

skills.sh installs
1.2K
GitHub stars
1.1K
last updated
Aug 21, 2026

Install

$ npx -y skills add jezweb/claude-skills --skill git-workflow --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Workflow

Guided workflows for common git operations that benefit from structured steps.

PR Preparation

When preparing a pull request:

  1. Gather context

    • git log main..HEAD --oneline — list all commits on the branch
    • git diff main...HEAD --stat — see all changed files
    • git status — check for uncommitted work
  2. Draft PR content

    • Title: under 70 chars, describes the change (not the branch name)
    • Body: summarise the "why", list key changes, add test plan
    • Use the commit history to write the summary — don't rely on memory
  3. Push and create

    git push -u origin HEAD
    gh pr create --title "..." --body "$(cat <<'EOF'
    ## Summary
    - ...
    
    ## Test plan
    - [ ] ...
    
    🤖 Generated with [Claude Code](https://claude.com/claude-code)
    EOF
    )"
    
  4. Verify — gh pr view --web to open in browser

Branch Cleanup

Clean up merged branches safely:

  1. Switch to main and pull latest

    git checkout main && git pull
    
  2. List merged branches (excludes main/master/develop)

    git branch --merged main | grep -vE '^\*|main|master|develop'
    

Sponsors

Details

Repository
github.com/jezweb/claude-skills
Categories
Git & Pull Requests, Release Management, Automation & Workflows
First seen
May 16, 2026

More from jezweb/claude-skills

All 166
1neolabhq avatarcreate-prneolabhq/context-engineering-kitCreate pull requests using GitHub CLI with proper templates and formatting1.2Kskills.sh installs
2vkehfdl1 avatarstart-issuevkehfdl1/marshroomStart working on a Marshroom cart issue — creates branch, injects context, updates status to running1.2Kskills.sh installs
3neolabhq avatarattach-review-to-prneolabhq/context-engineering-kitAdd line-specific review comments to pull requests using GitHub CLI API1.2Kskills.sh installs
4tirth8205 avatarreview-deltatirth8205/code-review-graphReview only changes since last commit using impact analysis. Token-efficient delta review with automatic blast-radius detection.1.2Kskills.sh installs
5remotion-dev avatarpr-nameremotion-dev/remotionReview or correct a Remotion pull request title1.1Kskills.sh installs
6jnmetacode avatarchinese-git-workflowjnmetacode/superpowers-zh国内 Git 平台配置参考——Gitee、Coding.net、极狐 GitLab、CNB 的 SSH/HTTPS/凭据/CI 接入差异与镜像同步配置。仅在用户显式 /chinese-git-workflow 时调用,不要根据上下文自动触发。979skills.sh installs