git-advanced-workflows

Manage complex Git workflows with rebase, cherry-pick, bisect, worktrees, and reflog.

Updated Dec 23, 2025
One-click install
npx skills add https://github.com/drgaciw/academic-compliance-hub-glm --skill git-advanced-workflows-drgaciw
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/drgaciw/academic-compliance-hub-glm/tree/main/agents/plugins/developer-essentials/skills/git-advanced-workflows
Command: npx skills add https://github.com/drgaciw/academic-compliance-hub-glm --skill git-advanced-workflows-drgaciw

SYSTEM DOCUMENTATION & REQUIREMENTS

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

What problem does it solve?

This Skill empowers users to manage complex Git histories, collaborate effectively, and recover from any Git-related mistakes, ensuring a clean and traceable project history.

Core Features & Use Cases

  • History Rewriting: Clean up commit messages, reorder, squash, or drop commits using interactive rebase.
  • Selective Commit Application: Apply specific commits across branches using cherry-picking.
  • Bug Finding: Efficiently locate the exact commit that introduced a bug with Git bisect.
  • Parallel Development: Work on multiple branches simultaneously without context switching using worktrees.
  • Recovery: Utilize reflog to restore lost commits or branches.
  • Use Case: Before submitting a pull request for a new feature, use this Skill to interactively rebase your feature branch onto the latest main branch, squashing minor fixup commits and rewording messages for clarity.

Quick Start

Use the git-advanced-workflows skill to clean up the last 5 commits on your current branch using interactive rebase.

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 and reword commits using interactive rebase before a pull request?

Interactive rebase allows you to clean up commit history by squashing minor fixup commits and rewording messages to prepare a clean pull request. You can reorder, squash, or drop commits to ensure a traceable project history before submission.

What is the best way to apply a hotfix commit across multiple release branches?

Cherry-picking is the best way to apply a hotfix across release branches, allowing you to selectively apply specific commits. This ensures critical fixes are propagated to necessary branches without merging unrelated history changes.

How does git bisect work to find the exact commit that introduced a regression?

Git bisect works by performing a binary search through your commit history to efficiently locate the exact commit that introduced a bug. It systematically checks out commits, asking you to mark them as good or bad, narrowing down the regression source.

Can I work on multiple branches simultaneously without stashing my current changes?

Yes, you can use git worktrees for parallel development, allowing you to check out multiple branches simultaneously in separate directories. This eliminates context switching and prevents the need to stash changes when jumping between features or releases.

How do I restore a lost commit or branch after an accidental hard reset?

You can restore a lost commit or branch by utilizing the git reflog, which records updates to the tip of branches. Reflog allows you to recover from errors and restore lost commits by finding and resetting to the specific reference hash.

When should I not use git rebase to manage my version control workflow?

You should avoid using git rebase on commits that have been pushed publicly to avoid rewriting shared history and causing conflicts for collaborators. It is best used for local history cleanup before submitting a pull request to ensure a clean project history.