git-advanced-workflows

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

16 stars

Best use case

git-advanced-workflows is best used when you need a repeatable AI agent workflow instead of a one-off prompt.

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

Teams using git-advanced-workflows should expect a more consistent output, faster repeated execution, less prompt rewriting.

When to use this skill

  • You want a reusable workflow that can be run more than once with consistent structure.

When not to use this skill

  • You only need a quick one-off answer and do not need a reusable workflow.
  • You cannot install or maintain the underlying files, dependencies, or repository context.

Installation

Claude Code / Cursor / Codex

$curl -o ~/.claude/skills/git-advanced-workflows/SKILL.md --create-dirs "https://raw.githubusercontent.com/diegosouzapw/awesome-omni-skill/main/skills/cli-automation/git-advanced-workflows/SKILL.md"

Manual Installation

  1. Download SKILL.md from GitHub
  2. Place it in .claude/skills/git-advanced-workflows/SKILL.md inside your project
  3. Restart your AI agent — it will auto-discover the skill

How git-advanced-workflows Compares

Feature / Agentgit-advanced-workflowsStandard Approach
Platform SupportNot specifiedLimited / Varies
Context Awareness High Baseline
Installation ComplexityUnknownN/A

Frequently Asked Questions

What does this skill do?

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

Where can I find the source code?

You can find the source code on GitHub using the link provided at the top of the page.

SKILL.md Source

# Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

## Do not use this skill when

- The task is unrelated to git advanced workflows
- You need a different domain or tool outside this scope

## Instructions

- Clarify goals, constraints, and required inputs.
- Apply relevant best practices and validate outcomes.
- Provide actionable steps and verification.
- If detailed examples are required, open `resources/implementation-playbook.md`.

## Use this skill when

- Cleaning up commit history before merging
- Applying specific commits across branches
- Finding commits that introduced bugs
- Working on multiple features simultaneously
- Recovering from Git mistakes or lost commits
- Managing complex branch workflows
- Preparing clean PRs for review
- Synchronizing diverged branches

## Core Concepts

## 🧠 Knowledge Modules (Fractal Skills)

### 1. [1. Interactive Rebase](./sub-skills/1-interactive-rebase.md)
### 2. [2. Cherry-Picking](./sub-skills/2-cherry-picking.md)
### 3. [3. Git Bisect](./sub-skills/3-git-bisect.md)
### 4. [4. Worktrees](./sub-skills/4-worktrees.md)
### 5. [5. Reflog](./sub-skills/5-reflog.md)
### 6. [Workflow 1: Clean Up Feature Branch Before PR](./sub-skills/workflow-1-clean-up-feature-branch-before-pr.md)
### 7. [Workflow 2: Apply Hotfix to Multiple Releases](./sub-skills/workflow-2-apply-hotfix-to-multiple-releases.md)
### 8. [Workflow 3: Find Bug Introduction](./sub-skills/workflow-3-find-bug-introduction.md)
### 9. [Workflow 4: Multi-Branch Development](./sub-skills/workflow-4-multi-branch-development.md)
### 10. [Workflow 5: Recover from Mistakes](./sub-skills/workflow-5-recover-from-mistakes.md)
### 11. [Rebase vs Merge Strategy](./sub-skills/rebase-vs-merge-strategy.md)
### 12. [Autosquash Workflow](./sub-skills/autosquash-workflow.md)
### 13. [Split Commit](./sub-skills/split-commit.md)
### 14. [Partial Cherry-Pick](./sub-skills/partial-cherry-pick.md)

Related Skills

hive-mind-advanced

16
from diegosouzapw/awesome-omni-skill

Advanced Hive Mind collective intelligence system for queen-led multi-agent coordination with consensus mechanisms and persistent memory

airflow-workflows

16
from diegosouzapw/awesome-omni-skill

Apache Airflow DAG design, operators, and scheduling best practices.

Advanced Testability Ai Ergonomic

16
from diegosouzapw/awesome-omni-skill

Design code for testability and AI/LLM ergonomics with explicit contracts and observable patterns. Use when optimizing code for AI tools, improving testability, or making codebases LLM-friendly.

advanced-statusline

16
from diegosouzapw/awesome-omni-skill

Implement AI-powered statusline with session tracking, plan detection, workspace emojis, and intelligent caching for Claude Code

advanced-rendering

16
from diegosouzapw/awesome-omni-skill

Master high-performance rendering for large datasets with Datashader. Use this skill when working with datasets exceeding 100M+ points, optimizing visualization performance, or implementing efficient rendering strategies with rasterization and colormapping techniques.

advanced-math-trading/portfolio-factors

16
from diegosouzapw/awesome-omni-skill

Factor modeling and portfolio construction (Markowitz, Black-Litterman, constraints, turnover).

advanced-math-trading/foundations-core

16
from diegosouzapw/awesome-omni-skill

Probability, moments/tails, Bayes, and statistical learning foundations for systematic trading.

advanced-file-management

16
from diegosouzapw/awesome-omni-skill

Advanced file management tools. Includes batch folder creation, batch file moving, file listing, and HTML author extraction.

advanced-example

16
from diegosouzapw/awesome-omni-skill

Advanced example showing all available metadata fields and complex folder structure

advanced-evaluation

16
from diegosouzapw/awesome-omni-skill

Master LLM-as-a-Judge evaluation techniques including direct scoring, pairwise comparison, rubric generation, and bias mitigation. Use when building evaluation systems, comparing model outputs, or establishing quality standards for AI-generated content.

Advanced Deterministic Runtime Container

16
from diegosouzapw/awesome-omni-skill

Build deterministic IoC containers with proper lifecycle management, scoping, and disposal patterns. Use when implementing DI containers, managing service lifetimes, or designing runtime systems.

advanced-analytics

16
from diegosouzapw/awesome-omni-skill

Advanced analytics including machine learning, predictive modeling, and big data techniques