Skills git-advanced-workflows
🧭

git-advanced-workflows

Safe 🌐 Network access⚙️ External commands📁 Filesystem access

Master advanced Git workflows and recovery

Advanced Git history tasks can be risky and time consuming. This skill provides clear guidance for rebase, cherry-pick, bisect, worktrees, and reflog recovery.

Supports: Claude Codex Code(CC)
📊 69 Adequate
1

Download the skill ZIP

2

Upload in Claude

Go to Settings → Capabilities → Skills → Upload skill

3

Toggle on and start using

Test it

Using "git-advanced-workflows". I reset to the wrong commit and lost work. How do I recover it?

Expected outcome:

  • Run git reflog and identify the commit before the reset
  • Create a recovery branch at that commit hash
  • Verify changes and continue work from the recovery branch

Using "git-advanced-workflows". How do I apply a security fix to three release branches at once?

Expected outcome:

  • Create fix on main branch first
  • Check out each release branch and cherry-pick the fix commit
  • Handle any conflicts per branch
  • Test each branch before pushing

Quality Score

38
Architecture
100
Maintainability
85
Content
21
Community
100
Security
91
Spec Compliance

What You Can Build

Clean feature branch history

Prepare a linear commit history before opening a pull request.

Backport a hotfix safely

Apply one fix across multiple release branches with cherry-pick steps.

Locate a regression commit

Use bisect steps to find the commit that introduced a bug.

Try These Prompts

Rebase basics
Show the exact interactive rebase steps to squash and reword my last five commits safely.
Cherry-pick a fix
Explain how to cherry-pick a specific commit onto release/2.0 and how to continue after conflicts.
Bisect with tests
Give a step by step git bisect workflow using a test command to locate a regression.
Worktrees and recovery
Describe how to use worktrees for parallel branches and how to recover a lost commit with reflog.

Best Practices

  • Create a backup branch before risky history edits
  • Use --force-with-lease when rewriting shared history
  • Keep commits small and descriptive for easier recovery

Avoid

  • Rebasing public branches used by collaborators
  • Force pushing without checking remote updates
  • Running bisect with a dirty working directory

Frequently Asked Questions

Is this skill compatible with all Git versions?
It works with modern Git versions that support rebase, bisect, worktree, and reflog.
Does it change my repository automatically?
No. It provides guidance only and does not run commands or modify files.
Can it integrate with my CI or scripts?
It can suggest steps, but it does not execute or configure CI pipelines.
Does it access my data or credentials?
No. It does not read files, environment variables, or network resources.
What if I cannot resolve a conflict?
Share the conflict details and current status to get targeted steps.
How is this different from basic Git help?
It focuses on advanced workflows like bisect, reflog recovery, and worktrees.

Developer Details

File structure

📄 SKILL.md