git-workflows

Name: git-workflows
Availability: InStock
Author: marcoamu

Automate complex Git workflows including rebasing, bisecting, worktrees, and conflict resolution.

1|Updated Mar 14, 2026

Search Tags:#git #monorepo #workflows #bisect #version-control #submodules #rebasing

Ready to run

npx skills add https://github.com/marcoamu/openclaw-workspace --skill git-workflows-marcoamu

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-workflows
Source: https://github.com/marcoamu/openclaw-workspace/tree/main/skills/git-workflows
Command: npx skills add https://github.com/marcoamu/openclaw-workspace --skill git-workflows-marcoamu

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Advanced git workflows streamline complex version-control tasks, helping teams clean up history, resolve conflicts, and manage multi-branch development with confidence.

Core Features & Use Cases

Interactive rebase to clean commit history before merging
Bisect to pinpoint bug-introducing commits across branches
Worktrees for parallel development and feature experimentation
Reflog-based recovery to undo destructive actions or recover lost commits
Subtrees and submodules management for monorepo-like setups
Conflict resolution strategies and cherry-picking across branches
Sparse checkout and monorepo patterns for large codebases

Quick Start

Start with an interactive rebase on the last five commits and resolve conflicts to clean up your history.

Frequently Asked Questions about git-workflows

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

FAQPage Schema

How do I clean up git commit history before merging a feature branch?▼

Use interactive rebasing to clean commit history before merging. This advanced git workflow allows you to squash, reorder, or edit commits across multi-branch features, resolving conflicts safely as you rewrite branch history.

What is the best way to find a bug-introducing commit across a long git history?▼

Git bisect is the best mechanism to pinpoint bug-introducing commits across branches. This workflow automates binary search through your commit history, identifying exactly which change introduced the regression for faster bug hunts.

How does git reflog recovery work for undoing destructive actions?▼

Git reflog recovery works by tracking reference updates to undo destructive actions or recover lost commits. It provides a safety net for advanced workflows, allowing you to restore previous HEAD states even after hard resets or accidental branch deletions.

Can I manage monorepo-like setups using git submodules and subtrees?▼

Yes, you can manage monorepo-like setups using git subtrees and submodules. These workflows handle multi-branch development and large codebases, with sparse checkout patterns available to optimize performance for complex repository structures.

Does this approach support parallel development without cloning multiple repositories?▼

Git worktrees support parallel development and feature experimentation without cloning. This workflow allows you to check out multiple branches simultaneously in separate directories, streamlining complex multi-branch feature development and isolated testing.

When should I use cherry-picking for conflict resolution across branches?▼

Use cherry-picking across branches when you need to apply specific commits without merging an entire branch. It serves as a targeted conflict resolution strategy, allowing safe history rewriting and precise patch management for multi-branch features.

alexanderop

using-git-worktrees

Create isolated git worktrees for feature branches with safety checks.

Community

Advanced

zangxin75

git-workflows

Performs advanced Git operations including rebasing, bisecting bugs, managing worktrees, recovering via reflog, handling subtrees/submodules, sparse checkout, resolving conflicts.

Community

Advanced