skills.rest
LuizEduPP
LuizEduPPCOMMUNITY
Explore all skills by this author →
GitHub

git-advanced-workflows

Rebase, cherry-pick, bisect, and manage worktrees for clean Git history.

Updated Apr 10, 2026
Search Tags:#git#recovery#branches#rebase#cherry-pick#workflows#bisect
One-click install
npx skills add https://github.com/LuizEduPP/skills --skill git-advanced-workflows-luizedupp
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/LuizEduPP/skills/tree/main/git-advanced-workflows
Command: npx skills add https://github.com/LuizEduPP/skills --skill git-advanced-workflows-luizedupp

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Managing sprawling commit histories, coordinating multi-branch collaboration, and recovering lost or conflicting changes without destructive rewrites.

Core Features & Use Cases

  • Interactive Rebase Mastery: Guide through pick, reword, edit, squash, fixup, and drop to craft logical histories and prepare PRs.
  • Cherry-Pick, Bisect, and Worktree Control: Apply specific commits across branches, locate bug-introducing changes, and work on multiple branches simultaneously without disruption.
  • Reflog Recovery & Best Practices: Track ref movements to restore deleted commits or branches, enforce safe force-pushes with --force-with-lease, and keep backups before risky operations.
  • Use Case: Clean up a feature branch before pushing, then cherry-pick a hotfix into release branches, run bisect to isolate a regression, and use worktrees plus reflog to recover any mishaps.

Quick Start

Start by rebasing your feature branch onto main and squashing fixup commits to prep for a clean PR.

Frequently Asked Questions about git-advanced-workflows

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I squash commits with interactive rebase before creating a pull request?▼

Cherry-pick conflicts occur when applying specific commits across branches with overlapping line changes. Resolve these conflicts by manually editing the flagged files, staging the corrections, and continuing the cherry-pick operation to finalize the hotfix.

What is the best way to find a bug-introducing commit using git bisect?▼

Git reflog tracks reference movements to restore deleted commits or branches. Find the lost commit hash in the reflog output and run a reset command to recover the lost state, ensuring safe restoration after accidental deletions or risky rewrites.

Can I work on multiple branches simultaneously using git worktree?▼

Autosquash streamlines fixup commit handling during interactive rebases by automatically reordering and squashing fixup commits onto their corresponding original commits. This maintains strict branch hygiene with minimal manual intervention when preparing PRs.

Why should I use force-with-lease instead of standard force push?▼

Git worktree enables working on multiple branches simultaneously without disruption. Multi-worktree editing creates separate working directories linked to the same repository, allowing contextual switches and parallel branch tasks without stashing current changes.

Related Skills

Explore More Software Engineering Skills→
einja-inceinja-inc
1

conflict-resolver

Resolve git conflicts per file during rebase, merge, stash, or cherry-pick.

Official
Advanced
dobrinz123dobrinz123

gsd-ship

Push branches, create pull requests, and monitor merge status.

Community
Intermediate
Minara-AIMinara-AI
28

push

Run pre-flight compile and type checks before pushing git commits.

Official
Advanced
timequitytimequity
6

disaster-recovery

Design disaster recovery plans with RTO and RPO targets.

Official
Intermediate