PlugWiki

git-advanced-workflows (wshobson): a Claude skill for rebase, bisect, worktrees and reflog

A skill from wshobson/agents that gives Claude a playbook for rebase, cherry-pick, bisect, worktrees and reflog recovery.

Installs
19.7K
on skills.sh
Stars
42.1K
on GitHub
Files
1
besides SKILL.md
Updated
Oct 2026
last repo commit

git-advanced-workflows teaches Claude five Git techniques: interactive rebase, cherry-pick, bisect, worktrees and reflog. It also lists best practices (such as --force-with-lease instead of --force), common pitfalls and recovery commands. It loads when your request matches its description, for example managing a complex Git history or troubleshooting a repository.

The skill is instructions and command examples. It bundles no scripts, only a second file, references/details.md, with five worked workflows and extra patterns such as autosquash and splitting a commit. Claude runs the Git commands in your repository, so some of them rewrite history.

Good for

  • Developers who want help cleaning up commits before a pull request
  • Anyone who lost commits and needs to get them back
  • Teams hunting the commit that introduced a bug

Install git-advanced-workflows

Claude Code

  1. 1

    Copy this prompt.

    Install the git-advanced-workflows skill in Claude Code. Run this command:
    
    npx skills add https://github.com/wshobson/agents --skill git-advanced-workflows
    
    Then check that it loaded and tell me how to use it.
  2. 2

    Paste it into Claude Code. It shows the change and asks before running it.

Requires Node.js.

From its listing on skills.sh. Source.

What's in the skill

When it loads

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.

Sections in SKILL.md

  1. When to Use This Skill
  2. Core Concepts
  3. 1. Interactive Rebase
  4. 2. Cherry-Picking
  5. 3. Git Bisect
  6. 4. Worktrees
  7. 5. Reflog
  8. Detailed patterns and worked examples
  9. Best Practices
  10. Common Pitfalls
  11. Recovery Commands

Key facts

License
MIT
Installs on skills.sh
19,673 as of 2026-11-02
Last repo commit
2026-10-30

What it includes

  • Squash, reword, reorder or drop commits before a PR

    Shows the rebase operations (pick, reword, edit, squash, fixup, drop) and commands such as rebasing the last 5 commits.

    Try: “Clean up my last 5 commits into logical pieces before I open a PR.”

    Runs code · Interactive rebase

  • Copy single commits or ranges to another branch

    Covers cherry-picking one commit, a range, or staging a pick without committing.

    Runs code · Cherry-picking

  • Binary-search history for the commit that broke things

    Covers manual bisect and automated bisect that runs a test script.

    Try: “Find which commit since v1.0.0 broke the build.”

    Runs code · Git bisect

  • Work on several branches in separate folders

    Lists, adds and removes worktrees so you can switch tasks without stashing.

    Runs code · Worktrees

  • Get back deleted commits and branches

    Uses the reflog to restore lost commits or a deleted branch.

    Try: “I reset to the wrong commit. Help me get my work back.”

    Runs code · Reflog recovery

  • Safe force push, backup branches, bisect on a clean tree

    A short list of habits and mistakes to avoid, such as rebasing shared branches.

    Read · Best practices and pitfalls

  • Abort, restore and undo commands with warnings

    Lists abort commands and undo options, and warns that reset --hard discards uncommitted changes.

    Runs code · Recovery commands

  • Five worked workflows plus autosquash and split-commit patterns

    Read when the main file is not enough. Covers cleaning a feature branch, hotfixes across releases, bisecting, multi-branch work and recovery.

    Read · references/details.md

From the official docs

Permissions

Medium risk

Claude runs Git commands in your repository, and several of the techniques rewrite history or discard changes. Work on a clean tree, make a backup branch first and read each destructive command before you approve it.

What it can do

  • Read your data
  • Create and change things
  • Delete things
  • Read-only mode

Watch out for

  • It can rewrite history and discard changes

    The skill's recovery section warns that git reset --hard deletes uncommitted changes that the reflog cannot recover. Run git status and stash or commit first. github.com

  • Force pushes can affect teammates

    The skill says to use --force-with-lease, not --force, and to rebase only local commits. Check the branch is yours before you let Claude push. github.com

Technical details
Scopes
  • Runs Git commands in the current repository

  • Teaches git push --force-with-lease, git reset --hard and git rebase -i

Questions

What does git-advanced-workflows do?

It gives Claude written guidance and command examples for interactive rebase, cherry-pick, bisect, worktrees and reflog recovery. Claude uses it when you ask for help with a complex Git history or a repository problem.

How do I install it?

Use the install box at the top of this page. The skill folder holds SKILL.md and references/details.md, so keep both together. The wshobson/agents README also documents a plugin marketplace route and a skills-only route with npx skills.

Does it need an API key or extra tools?

No API key is mentioned. The skill bundles no scripts, and its frontmatter holds only a name and a description. You need Git in the repository you are working in.

Is it safe to use?

Treat it like any Git help from an assistant. Several commands it teaches rewrite history or discard work, such as git rebase -i, force pushes and git reset --hard. The skill itself warns that --hard deletes uncommitted changes that the reflog cannot recover, so check git status first and make a backup branch before risky steps.

Can it recover a commit I lost?

It teaches the reflog route: find the commit hash with git reflog, then create a branch from it. The skill notes that reflog entries for unreachable commits expire after 30 days by default.

How is it different from just asking Claude about Git?

It puts a fixed set of techniques, safety habits and recovery commands into context whenever the topic matches. You get the same checklist each time, such as using --force-with-lease and creating a backup branch before a complex rebase.

Information

updated Nov 2, 2026

Repository
wshobson/agents
Folder
plugins/developer-essentials/skills/git-advanced-workflows

wshobson/agentsskills.sh

Sources

Docs, issue trackers and discussions this page is built from.

Show all 3
  1. SKILL.md · github.com
  2. details.md · github.com
  3. README.md · github.com

Updated Nov 2, 2026.