Awesome-omni-skill 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.

install
source · Clone the upstream repo
git clone https://github.com/diegosouzapw/awesome-omni-skill
Claude Code · Install into ~/.claude/skills/
T=$(mktemp -d) && git clone --depth=1 https://github.com/diegosouzapw/awesome-omni-skill "$T" && mkdir -p ~/.claude/skills && cp -r "$T/skills/cli-automation/git-advanced-workflows" ~/.claude/skills/diegosouzapw-awesome-omni-skill-git-advanced-workflows && rm -rf "$T"
manifest: skills/cli-automation/git-advanced-workflows/SKILL.md
source content

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