skills.rest
amurata
amurataCOMMUNITY
Explore all skills by this author →
GitHub

git-advanced-workflows

Perform advanced Git operations including rebasing, cherry-picking, bisecting, worktrees, and reflog recovery.

6|2|Updated Oct 19, 2025
Search Tags:#git#version control#worktree#reflog#rebase#cherry-pick#bisect
One-click install
npx skills add https://github.com/amurata/cc-tools --skill git-advanced-workflows-amurata
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/amurata/cc-tools/tree/main/plugins/developer-essentials/skills/git-advanced-workflows
Command: npx skills add https://github.com/amurata/cc-tools --skill git-advanced-workflows-amurata

SYSTEM DOCUMENTATION & REQUIREMENTS

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

What problem does it solve?

This Skill empowers you to manage complex Git histories, recover from mistakes, and collaborate more effectively by mastering advanced Git commands beyond basic commit and push.

Core Features & Use Cases

  • History Rewriting: Clean up commit messages, squash commits, and reorder history using interactive rebase.
  • Selective Commits: Apply specific commits to different branches using cherry-picking.
  • Bug Finding: Efficiently pinpoint the exact commit that introduced a bug with git bisect.
  • Parallel Work: Manage multiple branches simultaneously without context switching using git worktrees.
  • Recovery: Utilize git reflog as a safety net to recover lost commits or branches.
  • Use Case: You've made several messy commits on a feature branch and need to clean them up before creating a Pull Request. Use interactive rebase to squash, reword, and reorder your commits into a clean, logical sequence.

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 clean up messy commits before creating a pull request?▼

Use interactive rebase to clean up messy commits before a pull request by squashing, rewording, and reordering them into a logical sequence. This rewrites your branch history to ensure a clean commit log.

What is git bisect and how does it find bugs?▼

Git bisect is a binary search mechanism used to find the exact commit that introduced a bug. It efficiently pinpoints the faulty commit by checking out commits between known good and bad states.

Can I recover a lost commit or deleted branch in Git?▼

Yes, you can recover lost commits or deleted branches using git reflog. Reflog acts as a safety net by tracking reference updates, allowing you to restore repository states that appear lost.

What is the best way to work on multiple branches without context switching?▼

The best way to work on multiple branches without context switching is using git worktrees. Worktrees enable parallel development by allowing you to manage multiple branches simultaneously in separate directories.

How do I apply a specific commit from one branch to another?▼

To apply a specific commit from one branch to another, use git cherry-picking. This selective commit operation extracts the exact changes from a target commit and applies them to your current branch.

Related Skills

Explore More Software Engineering Skills→
nimadorostkarnimadorostkar
25

git-workflow

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

Community
Advanced
omeraltnomeraltn

agency-git-workflow-master

Enforce conventional commits and safe Git workflows across team repositories.

Community
Advanced
rnavarychrnavarych
14

git-workflows

Guide Git branching, commit conventions, and pull request workflows.

Community
Intermediate
AmidVoshakulAmidVoshakul

git-advanced-workflows

Optimize Git history via interactive rebasing, cherry-picking, and automated bisecting.

Community
Advanced