Git Workflow

What it does

When your agent uses it

• User asks to create a branch
• Clean up branches
• Follow a Git workflow
• CI/CD pipeline configuration (use ci-cd)

Example prompts

• “/git-workflow”

Requirements

• PowerShell
• Compatibility (from SKILL.md): opencode
• Pre-approved tools (allowed-tools): Read, Bash, Write, Grep

Workflow steps

5 steps, taken from the step headings in SKILL.md.

1. 1Create a feature branch
2. 2Make atomic commits
3. 3Prepare for PR
4. 4Create PR
5. 5Clean up after merge

What it can do on your machine

Read from SKILL.md and the folder at commit 4c68e5b. It shows what the files ask for, not the result of running them.

• Tool permissions

  Pre-approves these tools, so the agent can use them without asking each time:

  • Read
  • Bash
  • Write
  • Grep

  From allowed-tools in the SKILL.md frontmatter.

• Runs code

  Ships 4 files in scripts/ (PowerShell), which the agent can run.

  Shell commands in SKILL.md call:

  • git
  • gh

  From the folder's file list and the shell code blocks in SKILL.md.

• Network

  No URLs in SKILL.md. Its commands use git and gh, which can reach the network depending on how they are called.

  From URLs in SKILL.md, links to its own repository left out.

• Credentials

  Names no API keys, tokens, secrets or passwords.

  From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

• Compatibility

  opencode

  From compatibility in the SKILL.md frontmatter.

Context cost

Git Workflow loads about 2.4k tokens when it runs, and up to ~5.9k if it reads all its reference files. Until then it costs about 131 tokens; SKILL.md has 816 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it

~131

When it runs · the whole SKILL.md, loaded when a task matches

~2.4k

With references · SKILL.md plus every file in references/, read only if the agent opens them

~5.9k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

• NotePre-approves every shell command (allowed-tools: Bash)SKILL.md

  allowed-tools: Read, Bash, Write, Grep

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); the scripts in this folder are not scanned.

SKILL.md

The full file from EliasOulkadi/shokunin at commit 4c68e5b, republished under its MIT licence (© EliasOulkadi). 816 words, ~2,412 tokens.

name

git-workflow

description

Automate the complete Git development workflow — create feature branches with conventional naming, atomic commits with conventional commit messages, interactive rebase, squash merges, PR body generation from commit history, branch cleanup, and git worktree patterns. Use when user asks to create a branch, commit changes, make a PR, rebase, squash, clean up branches, or follow a Git workflow. Do NOT use for CI/CD pipeline configuration (use ci-cd), code review (use code-review), or GitHub Actions workflows.

allowed-tools

Read, Bash, Write, Grep

compatibility

opencode

triggers

git branch, create branch, commit, git commit, git push, git rebase, squash commits, git workflow, make a PR, pull request, git merge, git cleanup, branch…

negatives

CI/CD pipeline, GitHub Actions, code review, GitHub workflow, GitLab CI

license

MIT

metadata.workflow

development

metadata.audience

developers

metadata.version

3.0.0

metadata.author

shokunin

scripts/create-feature-branch.ps1 -Name "add-user-auth" -Type feat

scripts/auto-commit.ps1 -Scope "auth" -DryRun  # Preview first
scripts/auto-commit.ps1 -Scope "auth"           # Commit

<type>(<scope>): <description>

[optional body]

[optional footer]

# Interactive rebase (squash WIP commits)
git rebase -i main

# Generate PR body from commit history
scripts/pr-body.ps1 -Clipboard

# Create PR with generated body
gh pr create --title "feat(auth): add user authentication" --body "$(Get-Clipboard)"

# Or use the file
gh pr create --title "feat(auth): add user authentication" --body-file .pr-body.md

scripts/cleanup-branches.ps1

# During rebase, conflict arises
git status                          # See conflicted files
# Edit conflicted files → resolve markers (<<<<<<, ======, >>>>>>)
git add <resolved-files>
git rebase --continue               # Move to next commit

# If the rebase is going poorly and you want to bail:
git rebase --abort                  # Return to pre-rebase state

# If you're mid-rebase, unsure, and want to compare:
git diff                            # Show conflict diff
git mergetool                       # Launch configured merge tool (VS Code: code --wait $MERGED)

# Skip a problematic commit entirely:
git rebase --skip

# After rebase, verify history:
git log --oneline --graph -20

# Create a new worktree for a feature
git worktree add ../project-feat-auth feat/add-user-auth

# List all worktrees
git worktree list

# Remove a worktree after branch is merged
git worktree remove ../project-feat-auth
# Then delete the branch normally

© EliasOulkadi, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 6 other files (scripts, references) in .pack/skills/git-workflow of EliasOulkadi/shokunin.

• SKILL.md
• references/branch-strategy.md
• references/git-workflows.md
• scripts/auto-commit.ps1
• scripts/cleanup-branches.ps1
• scripts/create-feature-branch.ps1
• scripts/pr-body.ps1

Open the folder on GitHubat commit 4c68e5b