skills.rest
shirulot
shirulotCOMMUNITY
Explore all skills by this author →
GitHub

git-advanced-workflows

Perform interactive rebasing, squashing, and reordering of Git commits.

Updated Jul 6, 2026
Search Tags:#git#workflow#debugging#version control#repository#rebase
One-click install
npx skills add https://github.com/shirulot/codex-skill --skill git-advanced-workflows-shirulot
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/shirulot/codex-skill/tree/main/git-advanced-workflows
Command: npx skills add https://github.com/shirulot/codex-skill --skill git-advanced-workflows-shirulot

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This skill addresses the complexity of maintaining a clean, professional Git history and provides a safety net for recovering from common version control mistakes.

Core Features & Use Cases

  • History Management: Perform interactive rebasing, squashing, and reordering of commits to ensure a linear and readable project history.
  • Troubleshooting & Recovery: Utilize Git bisect to isolate bugs and the reflog to recover lost commits or deleted branches.
  • Multi-tasking: Manage simultaneous feature development using Git worktrees without the need for constant stashing or switching branches.

Quick Start

Use the git-advanced-workflows skill to perform an interactive rebase on the last five commits to clean up your current feature branch.

Frequently Asked Questions about git-advanced-workflows

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

FAQPage Schema
How do I perform an interactive rebase to squash and reorder commits?▼

Use interactive rebase to squash, reword, and reorder commits, ensuring a linear and readable project history. This skill provides the command patterns to safely clean up your current feature branch.

How does git bisect work for isolating bugs?▼

Git bisect automates regression testing by systematically checking out commits to isolate the exact change that introduced a bug. This skill provides the command patterns to execute bisect workflows for complex development scenarios.

Can I recover lost commits or deleted branches using the reflog?▼

Yes, the reflog tracks reference updates, allowing you to recover lost commits or deleted branches. This skill provides troubleshooting and recovery patterns to safely restore repository history after version control mistakes.

What is the best way to manage multiple feature branches without constant stashing?▼

Git worktrees allow you to manage simultaneous feature development without constant stashing or branch switching. This skill provides patterns for setting up multi-branch worktrees to enable parallel workflows.

Do I need any special dependencies to use advanced git workflows?▼

No special dependencies are required. These advanced git workflows require only standard Git CLI tools and adherence to best practices for collaborative repository maintenance.

When should I avoid rewriting git history in a shared repository?▼

You should avoid history rewriting on shared branches to prevent collaborative maintenance issues. This skill emphasizes safe history manipulation patterns and best practices to prevent repository recovery scenarios.

Related Skills

Explore More Software Engineering Skills→
jinyongpjinyongp
2

survey

Scan repository manifests and version control to summarize project commands and risks.

Community
Intermediate
fabiolpgomesfabiolpgomes

aiox-devops

Enforce quality gates and orchestrate GitHub releases with semantic versioning.

Community
Advanced
stacksjsstacksjs
622

stacks-shell

Execute and manage shell commands in Stacks projects via @stacksjs/shell.

Official
Intermediate
nimadorostkarnimadorostkar
25

git-workflow

Manage Git repository history through atomic commits, interactive rebasing, and automated bisection.

Community
Advanced