skills.rest
Gozei
GozeiCOMMUNITY
Explore all skills by this author →
GitHub

git-workflows

Guide developers through advanced Git workflows like rebase, bisect, and worktrees.

Updated Aug 23, 2026
Search Tags:#git#monorepo#rebase#workflows#bisect#version-control#conflicts
One-click install
npx skills add https://github.com/Gozei/ClawX --skill git-workflows-gozei
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflows
Source: https://github.com/Gozei/ClawX/tree/main/resources/custom-skills/git-workflows
Command: npx skills add https://github.com/Gozei/ClawX --skill git-workflows-gozei

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Complex Git workflows can be error prone and time consuming. This skill guides developers through advanced operations (rebase, bisect, worktrees, reflog recovery, subtrees/submodules) to maintain clean history and fast iteration.

Core Features & Use Cases

  • Interactive rebase to clean up commits before merging.
  • Bisect to pinpoint bug introducing commits across branches.
  • Worktrees and sparse checkout for parallel development in monorepos.
  • Reflog-based recovery to undo risky operations and recover lost commits.
  • Manage subtrees and submodules for shared codebases.
  • Cherry-pick across branches to cherry-pick changes without merging.
  • Conflict resolution guidance during merges and rebases.

Quick Start

Initiate an interactive rebase of the last five commits on the current branch.

Frequently Asked Questions about git-workflows

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

FAQPage Schema
How do I perform an interactive rebase to clean up commits before merging?▼

To perform an interactive rebase, specify the base commit and edit commits through the interactive prompt. This skill guides the rebase process step-by-step to ensure a clean commit history before merging.

What is the best way to pinpoint a bug-introducing commit across branches?▼

Git bisect identifies the specific commit that introduced a bug by performing a binary search across your commit history. This skill automates bisect guidance to pinpoint bug-introducing commits across branches efficiently.

How do I use git worktrees for parallel development in a monorepo?▼

Git worktrees allow you to check out multiple branches simultaneously in separate directories, enabling parallel development. This skill provides guidance on worktrees and sparse checkout specifically for monorepo workflows.

Can I recover lost commits after a risky rebase or reset operation?▼

Yes, reflog-based recovery allows you to undo risky operations and recover lost commits. This skill guides you through safe recovery procedures using reflog and stashes to restore your working state.

How do I resolve merge conflicts during a rebase?▼

Conflict resolution during a rebase involves identifying conflicting changes, manually editing the affected files, and staging the corrections. This skill provides guidance for resolving conflicts during both merges and rebases.

Do I need Git installed to manage subtrees and submodules in a monorepo?▼

Yes, Git must be available in your environment to manage subtrees and submodules. This skill specifies Git as a requirement for handling shared codebases and performing complex version control tasks.

Related Skills

Explore More Software Engineering Skills→
EdanStarfireEdanStarfire
15

git-state-validator

Validate Git repository state before branching, merging, or pulling.

Community
Basic
Conceptual-MachinesConceptual-Machines
195

release

Create and push a v-prefixed git tag on the main branch.

Official
Intermediate
omeraltnomeraltn

agency-git-workflow-master

Enforce conventional commits and safe Git workflows across team repositories.

Community
Advanced
TienchingTienching
3

git-master

Route and execute advanced Git tasks like atomic commits, rebasing, and history cleanup.

Community
Intermediate