git-workflow

Automate Git branch creation, conventional commits, PR bodies, and cleanup.

110|14|Updated May 12, 2026
One-click install
npx skills add https://github.com/EliasOulkadi/shokunin --skill git-workflow-eliasoulkadi
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/EliasOulkadi/shokunin/tree/main/.pack/skills/git-workflow
Command: npx skills add https://github.com/EliasOulkadi/shokunin --skill git-workflow-eliasoulkadi

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill prevents messy Git history and error-prone PR preparation by automating the end-to-end workflow from branch creation through commit formatting, PR description drafting, and branch cleanup.

Core Features & Use Cases

  • Branch creation with conventional naming: Automatically creates a feature branch from the latest default branch using a consistent type prefix (feat/fix/docs/refactor/chore/style/test).
  • Atomic conventional commits: Generates conventional commit messages and stages+commits changes in small logical units.
  • PR body generation + cleanup: Produces a structured PR description from commit history, helps you squash/rebase appropriately, and deletes merged branches to keep the repo tidy.
  • Git worktree support: Enables parallel branch work without stashing or repeatedly cloning, useful for hotfixes, reviews, and side-by-side testing.

Quick Start

Create a conventional feature branch, commit your changes with conventional commit messaging, generate a PR body from the commits since the base branch, and then clean up merged branches afterward.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I generate a PR description from conventional commit history?

It creates a feature branch from the latest default branch state using a consistent type prefix, such as feat, fix, docs, refactor, chore, style, or test. This naming convention automatically categorizes the branch purpose for consistent tracking.

How do I use git worktree for parallel branch work without stashing?

Git worktree support enables parallel branch work by allowing you to manage multiple working directories from a single repository. You can handle hotfixes or side-by-side testing simultaneously without stashing changes or cloning the repository again.

What is the best way to prepare an interactive rebase and squash merge?

The best way to prepare an interactive rebase is to stage and commit changes in small logical units using atomic conventional commits. This creates a clean commit history that is easy to squash and rebase before merging into the target branch.

Does this Git workflow automation handle CI/CD and GitHub Actions configuration?

No, this Git workflow automation explicitly avoids CI/CD and GitHub Actions workflow configuration. It focuses solely on branch creation, commit formatting, interactive rebase preparation, PR body generation, and safe merged branch cleanup.

Why should I clean up merged branches and how does it work safely?

You should clean up merged branches to keep the repository tidy and prevent branch clutter. It works by applying safe safeguards during the deletion process, ensuring only fully merged branches are removed to prevent accidental data loss.