Git Advanced Workflows

VerifiedSafe

Covers interactive rebase, cherry-picking, git bisect, worktrees, and reflog. Helps maintain clean commit history, apply specific commits across branches, find bug introductions, and recover from mistakes. Ideal for cleaning up feature branches before PRs, multi-branch development, and troubleshooting.

Sby Skills Guide Bot
DevelopmentAdvanced
806/2/2026
Claude Code
#git#version-control#advanced-workflows#history-management

Recommended for

Our review

Master advanced Git workflows to maintain a clean history, collaborate effectively, and recover from any situation.

Strengths

  • Covers interactive rebase, cherry-picking, bisect, worktrees, and reflog.
  • Provides concrete workflows for cleaning history, applying hotfixes across releases, and recovering from mistakes.
  • Helps manage complex branch workflows and prepare clean pull requests.
  • Includes strategies for choosing between rebase and merge.

Limitations

  • Requires a solid understanding of Git fundamentals.
  • Operations like rebase can be dangerous if used incorrectly.
  • Not suitable for beginners or trivial Git tasks.
When to use it

Use this skill when cleaning up commit history, applying specific commits across branches, finding bug introductions, or recovering lost commits.

When not to use it

Do not use it for basic Git operations like committing, pushing, or pulling, or when a GUI is preferred.

Security analysis

Safe
Quality score75/100

The skill provides educational guidance for advanced Git workflows and does not instruct any destructive, exfiltrating, or obfuscated actions. It does not involve executing arbitrary shell commands or network operations. Git operations, while powerful, are legitimate and common in development environments. No malicious or unsafe instructions are present.

No concerns found

Examples

Clean up feature branch before PR
I have a feature branch with messy commits. Help me use interactive rebase to squash, reword, and reorder commits before opening a pull request.
Find bug introduction with bisect
A bug was introduced in the last 50 commits. Use git bisect to find the exact commit that caused it.
Recover lost commits with reflog
I accidentally ran 'git reset --hard' and lost my last commits. Show me how to use git reflog to recover them.

version: 4.1.0-fractal name: git-advanced-workflows description: 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.

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

Related skills