skills.rest
vonrobak
vonrobakCOMMUNITY
Explore all skills by this author →
GitHub

git-advanced-workflows

Manage Git histories with rebase, bisect, worktrees, and reflog recovery.

44|3|Updated Oct 31, 2025
Search Tags:#git#version control#worktrees#reflog#rebase#cherry-pick#bisect
One-click install
npx skills add https://github.com/vonrobak/fedora-homelab-containers --skill git-advanced-workflows-vonrobak
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/vonrobak/fedora-homelab-containers/tree/main/.claude/skills/git-advanced-workflows
Command: npx skills add https://github.com/vonrobak/fedora-homelab-containers --skill git-advanced-workflows-vonrobak

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) and assets (resource) components.

What problem does it solve?

This Skill empowers you to confidently manage complex Git histories, collaborate effectively with a clean codebase, and recover from any Git-related mistake, ensuring your project's integrity and reducing merge conflicts.

Core Features & Use Cases

  • Interactive Rebase: Clean up messy commit histories by squashing "WIP" commits, reordering changes, and rewording messages for crystal-clear pull requests.
  • Git Bisect: Efficiently find the exact commit that introduced a bug using a powerful binary search approach, saving hours of manual debugging.
  • Worktrees: Work on multiple branches simultaneously without the hassle of stashing or frequent context switching, boosting your parallel development efficiency.
  • Reflog: Act as your ultimate safety net, tracking all Git operations to help you recover lost commits or branches, even after a hard reset.
  • Use Case: A developer needs to prepare a feature branch for a pull request. This skill guides them through an interactive rebase to squash "fix typo" commits, reword unclear messages, and create a clean, linear history, making the review process much smoother and faster.

Quick Start

I need to clean up my feature branch 'feature/new-api' before creating a pull request. Guide me through the interactive rebase process to squash my "fix" commits and reword messages for clarity.

Frequently Asked Questions about git-advanced-workflows

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

FAQPage Schema
How do I clean up my Git commit history before a pull request?▼

Interactive rebase lets you squash, reorder, and reword commits to create a clean linear history. Run `git rebase -i HEAD~N` (where N is the number of commits) to combine "fix" commits, clarify messages, and prepare your branch for review.

How do I find which commit introduced a bug?▼

Git bisect performs a binary search through your commit history to pinpoint the exact commit that broke functionality. Run `git bisect start`, mark bad and good commits, and bisect automates testing to isolate the culprit in logarithmic time.

Can I work on multiple Git branches simultaneously without stashing?▼

Worktrees let you check out multiple branches in separate working directories at the same time. Create a worktree with `git worktree add` to switch contexts instantly without stashing changes, improving parallel development efficiency.

How do I recover a lost commit or branch in Git?▼

Reflog tracks all Git operations and acts as a safety net for recovering lost commits or branches. Use `git reflog` to view the history of HEAD movements, then `git checkout` or `git reset` to restore work even after hard resets.

What's the best way to apply specific commits from one branch to another?▼

Cherry-pick applies individual commits to your current branch without merging entire branches. Use `git cherry-pick <commit>` to selectively integrate targeted changes, useful for backporting fixes or coordinating across feature and release branches.

Why should I use disciplined commit messaging in Git workflows?▼

Clear commit messages maintain an auditable repository history and reduce merge conflicts during collaboration. Rewriting messages during interactive rebase ensures consistency, making blame investigations and release notes generation straightforward.

Related Skills

Explore More Software Engineering Skills→
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic
concept2cureconcept2cure

ship

Automate the ship workflow from branch merge to pull request creation.

Community
Advanced
WulnutWulnut
2

git-commit

Standardize Git commit messages and branch names with Conventional Commits.

Community
Intermediate
curiositechcuriositech
181

git-workflow-expert

Guide Git branching strategies, merge conflict resolution, and advanced operations.

Official
Advanced