git-workflow-skill

Organize Git history with interactive rebase, cherry-pick, and conventional commits.

1|1|Updated Mar 22, 2026
One-click install
npx skills add https://github.com/zzafergok/skills --skill git-workflow-skill-zzafergok
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow-skill
Source: https://github.com/zzafergok/skills/tree/main/08-engineering-quality/git-workflow-skill
Command: npx skills add https://github.com/zzafergok/skills --skill git-workflow-skill-zzafergok

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Maintaining a clean, auditable Git history and executing advanced Git operations safely to prevent messy commits and broken branches.

Core Features & Use Cases

  • Commit hygiene: craft meaningful commits with structured messages and logical grouping.
  • History rewriting: perform interactive rebases, squashes, and cleanups to prepare branches for PRs.
  • Multi-branch workflows: cherry-pick, worktrees, and hotfix propagation across branches to keep releases aligned.

Quick Start

Clean up my last five commits with an interactive rebase onto main.

Frequently Asked Questions about git-workflow-skill

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

FAQPage Schema
How do I safely clean up my Git history with an interactive rebase?

Git interactive rebase lets you squash, edit, and reorder commits to prepare a clean branch for pull requests. This workflow provides safety guidance to prevent broken branches during history rewriting.

What is the best way to propagate a hotfix across multiple Git branches?

Cherry-pick and worktree management are the best ways to propagate hotfixes across multiple Git branches. This keeps releases aligned by applying specific fixes through a repeatable, auditable workflow.

How do I write meaningful Git commits with a structured message format?

Meaningful Git commits use conventional-commit standards with structured messages and logical grouping. This maintains a clean, auditable history for everyday development tasks and post-merge cleanup.

Can I use Git bisect to track down a regression in my codebase?

You can use Git bisect to systematically track down regressions in your codebase. The workflow integrates this with reflog tracking to maintain an auditable trail of your history operations.

Why does Git reflog tracking matter for post-merge cleanup?

Git reflog tracking matters because it provides an auditable record of reference updates, making post-merge cleanup safer across branches. It helps you recover lost commits and verify history changes.

When do I need Git worktree management for multi-branch workflows?

You need Git worktree management when maintaining multiple branches simultaneously for hotfix propagation or feature development. It lets you work on different branches in separate directories without switching contexts constantly.