Git Advanced Workflows

dokhacgiakhoa/git-advanced-workflows

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

3k tokens

context cost

the whole folder, loaded on every use

files

instructions only

copies elsewhere

how many repositories repackaged it

505

stars on the repo

on the repository, not the skill itself

Install

one command, takes just this skill from the repository

npx skills add https://github.com/Dokhacgiakhoa/Agent-Skills-4-Vibe-Coding-CLI --skill git-advanced-workflows

What comes with it

8 343 bytes besides the instruction

sub-skills/1-interactive-rebase.md

sub-skills/2-cherry-picking.md

sub-skills/3-git-bisect.md

sub-skills/4-worktrees.md

sub-skills/5-reflog.md

sub-skills/autosquash-workflow.md

sub-skills/partial-cherry-pick.md

sub-skills/rebase-vs-merge-strategy.md

sub-skills/split-commit.md

sub-skills/workflow-1-clean-up-feature-branch-before-pr.md

sub-skills/workflow-2-apply-hotfix-to-multiple-releases.md

sub-skills/workflow-3-find-bug-introduction.md

sub-skills/workflow-4-multi-branch-development.md

sub-skills/workflow-5-recover-from-mistakes.md

The instruction itself

20 sections, as written by the author

Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

Do not use this skill when

The task is unrelated to git advanced workflows
You need a different domain or tool outside this scope

Instructions

Clarify goals, constraints, and required inputs.
Apply relevant best practices and validate outcomes.
Provide actionable steps and verification.
If detailed examples are required, open resources/implementation-playbook.md.

Use this skill when

Cleaning up commit history before merging
Applying specific commits across branches
Finding commits that introduced bugs
Working on multiple features simultaneously
Recovering from Git mistakes or lost commits
Managing complex branch workflows
Preparing clean PRs for review
Synchronizing diverged branches

Core Concepts

🧠 Knowledge Modules (Fractal Skills)

1. 1. Interactive Rebase

2. 2. Cherry-Picking

3. 3. Git Bisect

4. 4. Worktrees

5. 5. Reflog

6. Workflow 1: Clean Up Feature Branch Before PR

7. Workflow 2: Apply Hotfix to Multiple Releases

8. Workflow 3: Find Bug Introduction

9. Workflow 4: Multi-Branch Development

10. Workflow 5: Recover from Mistakes

11. Rebase vs Merge Strategy

12. Autosquash Workflow

13. Split Commit

14. Partial Cherry-Pick

How to use it

Copy the folder

Take dokhacgiakhoa/git-advanced-workflows from the repository into ~/.claude/skills for personal use, or into .claude/skills inside a project.

Check the name does not clash

The agent identifies a skill by the name field in its header. Two skills with the same name cannot sit side by side — one of them will be ignored.