skills.rest
azap026
azap026COMMUNITY
Explore all skills by this author →
GitHub

git-advanced-workflows

Perform rebases, cherry-picks, bisects, and worktree operations to manage Git history.

Updated Aug 27, 2026
Search Tags:#git#worktrees#reflog#bisect#version-control#rebasing#cherry-picking
One-click install
npx skills add https://github.com/azap026/smetalabv3 --skill git-advanced-workflows-azap026
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/azap026/smetalabv3/tree/main/.agent/skills/git-advanced-workflows
Command: npx skills add https://github.com/azap026/smetalabv3 --skill git-advanced-workflows-azap026

SYSTEM DOCUMENTATION & REQUIREMENTS

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

What problem does it solve?

This skill helps developers manage complex Git histories, enabling clean, review-friendly histories and safer collaboration across multiple branches.

Core Features & Use Cases

  • Interactive Rebase: rewrite history by editing, reordering, squashing commits.
  • Cherry-Picking: selectively apply commits across branches.
  • Git Bisect: quickly locate the bad commit when bugs appear.
  • Worktrees: work on multiple branches simultaneously without stashing or switching.
  • Reflog: recover lost commits and restore references safely.
  • Practical workflows: clean up feature branches, apply hotfixes across releases, and recover from mistakes using a safety net.

Quick Start

Use this skill to learn and perform rebases, cherry-picks, bisects, and worktrees on a project. It provides practical steps for cleaning up commit history and coordinating across branches.

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?▼

Interactive rebase lets you rewrite Git history by editing, reordering, or squashing commits to clean up feature branches. You can use this skill to perform practical step-by-step rebases for preparing clean PRs.

What is the best way to apply a hotfix commit across multiple release branches?▼

Cherry-picking is the best way to selectively apply specific commits across multiple branches. This skill provides practical workflows for synchronizing features and applying hotfixes across releases without merging entire branches.

How does git bisect work for finding the commit that introduced a bug?▼

Git bisect performs a binary search through your commit history to quickly locate the bad commit when bugs appear. This skill guides you through the bisect process to pinpoint regressions efficiently.

Can I work on multiple branches simultaneously without stashing or switching?▼

Yes, Git worktrees allow you to work on multiple branches simultaneously without stashing or switching. This skill covers cross-branch worktree operations to facilitate multi-branch workflows.

How do I recover lost commits after a hard reset or failed rebase?▼

You recover lost commits using Git reflog, which provides a safety net to restore references and find orphaned commits. This skill covers reflog-based recovery to safely undo mistakes.

Do I need any tools besides Git installed to manage complex version control histories?▼

No, you only need Git installed to manage complex histories. This skill operates purely with Git commands to handle rebases, cherry-picks, bisects, and worktrees without requiring additional software.

Related Skills

Explore More Software Engineering Skills→
serverless-dnaserverless-dna
180

speckit-git-initialize

Initialize a Git repository with an initial commit in the current directory.

Official
Intermediate
a-taka-tak
1

git-create-pr

Commit changes, push to origin, and create a GitHub Pull Request.

Community
Intermediate
ohyesgocoolohyesgocool

resolve-conflicts

Merge target branch changes into a feature branch with conflict resolution and verification.

Community
Advanced
nimadorostkarnimadorostkar
25

git-workflow

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

Community
Advanced