netresearch/git-workflow
skills/git-workflow/SKILL.md
Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, creating releases, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees.
$ install --global
skillsauthnpx skillsauth add netresearch/git-workflow-skill git-workflowInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Jun 13, 2026, 6:57 AM127.1s14 files scanned
SKILL.md
- name:
- git-workflow
- description:
- Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, creating releases, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees.
- license:
- (MIT AND CC-BY-SA-4.0). See LICENSE-MIT and LICENSE-CC-BY-SA-4.0
- compatibility:
- Requires git, gh CLI.
- author:
- Netresearch DTT GmbH
- version:
- 1.17.0
- repository:
- https://github.com/netresearch/git-workflow-skill
- allowed-tools:
- Bash(git:*) Bash(gh:*) Read Write
Git Workflow Skill
Expert patterns for Git: branching, commits, collaboration, CI/CD.
Critical Rules (Non-Negotiable)
- No direct push to main — always open a PR.
- No merge before all threads resolved — run the merge gate in
references/pull-request-workflow.md. - No squash unless asked — atomic commits preserved; keeps GPG signatures and bisection.
- No "tested/verified/working" without pasted command output — if you cannot run the check, say so.
- No edits to installed skill/plugin cache paths (
~/.claude/skills/,~/.claude/plugins/cache/,**/.bare/**) — always the repo worktree. Verifypwdfirst. - Force-push only with
--force-with-lease— never plain--force. - Commit before rebase —
add → commit → fetch → rebase → push. Rebase aborts on a dirty tree; the push then rejects as non-fast-forward.
See references/pull-request-workflow.md for merge-gate, atomic-commit, and SHA-citation patterns.
Reference Files
Load references on demand:
| Reference | Content Triggers |
|-----------|-----------------|
| references/branching-strategies.md | Branching model, Git Flow, GitHub Flow, trunk-based, branch protection |
| references/commit-conventions.md | Commit messages, conventional commits, DCO sign-off, semantic versioning, commitlint |
| references/pull-request-workflow.md | PR create/review/merge, thread resolution, merge strategies, CODEOWNERS, signed commits + rebase |
| references/ci-cd-integration.md | GitHub Actions, GitLab CI, semantic release, deployment |
| references/advanced-git.md | Rebase, cherry-pick, bisect, stash, worktrees, reflog, submodules, recovery |
| references/github-releases.md | Release management, immutable releases, --latest=false, multi-branch |
| references/git-hooks-setup.md | Hook frameworks, detection, recommended hooks per stage |
| references/claude-code-hooks.md | Claude Code settings.json hooks — merge gate, cache-path rejection, auto-lint |
| references/code-quality-tools.md | shellcheck, shfmt, git-absorb, difftastic |
| references/merge-gate-watcher.md | Merge-driver loop, hard/soft check taxonomy, rerun stale-SHA, review-bot rounds |
Conventional Commits
<type>[scope]: <description>
Types: feat (MINOR), fix (PATCH), docs, style, refactor, perf, test, build, ci, chore, revert
Breaking change: Add ! after type or BREAKING CHANGE: in footer.
Branch Naming
feature/TICKET-123-description
fix/TICKET-456-bug-name
release/1.2.0
hotfix/1.2.1-security-patch
Hook Detection
Detect hooks before first commit:
ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo "No hooks"
Install: lefthook install | composer install | npm install | pre-commit install
Critical Release Rules
- Immutable releases: Deleted releases permanently block tag reuse; bump version instead.
- Multi-branch releases: Use
--latest=falsefrom non-default branches. - Pre-release: Version bumped, CI green, CHANGELOG updated,
git pullBEFOREgh release create.
PR Merge Requirements
Before merging: threads resolved, CI green (incl. annotations), rebased, signed. Rebase-only + signed: git merge --ff-only.
Verification
./scripts/verify-git-workflow.sh /path/to/repository
Contributing: https://github.com/netresearch/git-workflow-skill
Related Skills
openclaw/openclaw-secret-scanning-maintainer
development
VerifiedTrustedCommunity
Maintainer-only workflow for handling GitHub Secret Scanning alerts on OpenClaw. Use when Codex needs to triage, redact, clean up, and resolve secret leakage found in issue comments, issue bodies, PR comments, or other GitHub content.
357,764SKILL.mdUpdated Apr 15, 2026
openclaw/openclaw-release-maintainer
development
VerifiedTrustedCommunity
Maintainer workflow for OpenClaw releases, prereleases, changelog release notes, and publish validation. Use when Codex needs to prepare or verify stable or beta release steps, align version naming, assemble release notes, check release auth requirements, or validate publish-time commands and artifacts.
357,764SKILL.mdUpdated Apr 10, 2026
openclaw/openclaw-qa-testing
development
VerifiedTrustedCommunity
Run, watch, debug, and extend OpenClaw QA testing with qa-lab and qa-channel. Use when Codex needs to execute the repo-backed QA suite, inspect live QA artifacts, debug failing scenarios, add new QA scenarios, or explain the OpenClaw QA workflow. Prefer the live OpenAI lane with regular openai/gpt-5.4 in fast mode; do not use gpt-5.4-pro or gpt-5.4-mini unless the user explicitly overrides that policy.
357,764SKILL.mdUpdated Apr 10, 2026
openclaw/openclaw-parallels-smoke
development
VerifiedTrustedCommunity
End-to-end Parallels smoke, upgrade, and rerun workflow for OpenClaw across macOS, Windows, and Linux guests. Use when Codex needs to run, rerun, debug, or interpret VM-based install, onboarding, gateway smoke tests, latest-release-to-main upgrade checks, fresh snapshot retests, or optional Discord roundtrip verification under Parallels.
357,764SKILL.mdUpdated Apr 10, 2026