skills.rest
zangxin75
zangxin75COMMUNITY
Explore all skills by this author →
GitHub

git-workflows

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

Updated Mar 1, 2026
Search Tags:#git#version control#worktree#monorepo#rebase#conflict resolution#bisect
One-click install
npx skills add https://github.com/zangxin75/openclaw-skills --skill git-workflows-zangxin75
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflows
Source: https://github.com/zangxin75/openclaw-skills/tree/main/git-workflows
Command: npx skills add https://github.com/zangxin75/openclaw-skills --skill git-workflows-zangxin75

SYSTEM DOCUMENTATION & REQUIREMENTS

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

What problem does it solve?

This Skill tackles complex Git scenarios beyond basic add/commit/push, enabling efficient version control for advanced development workflows.

Core Features & Use Cases

  • History Management: Interactive rebase for cleaning up commits, squashing, and reordering.
  • Bug Tracking: Git bisect for efficiently identifying the commit that introduced a bug.
  • Parallel Development: Worktrees for simultaneous work on multiple branches.
  • Recovery: Reflog for recovering lost commits or undoing mistakes.
  • Dependency Management: Subtree and submodule for managing external codebases.
  • Monorepo Efficiency: Sparse checkout for working with large repositories.
  • Conflict Resolution: Advanced strategies for resolving merge conflicts.

Quick Start

Use the git-workflows skill to find the commit that introduced a bug by running 'git bisect start' and following the prompts.

Frequently Asked Questions about git-workflows

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

FAQPage Schema
How do I use git bisect to find which commit introduced a bug?▼

Git bisect identifies the specific commit that introduced a bug by binary searching through your commit history. You start the process, mark commits as good or bad, and it automatically narrows down the offending revision.

How do I clean up and squash commits with interactive rebase?▼

Interactive rebase allows you to clean up commit history by squashing, reordering, or editing existing commits. You select a base commit and the tool opens an editor to define how each commit should be handled.

What is the best way to manage multiple branches simultaneously with git worktree?▼

Git worktree enables parallel development by allowing you to check out multiple branches into separate directories simultaneously. This lets you work on different features without stashing or switching contexts.

How do I recover lost commits after a hard reset using git reflog?▼

Git reflog tracks changes to your branch tips and HEAD, allowing you to recover lost commits after a hard reset. It provides a history of reference updates so you can checkout a previous state.

Can I use sparse checkout for monorepos to avoid downloading everything?▼

Sparse checkout allows you to work with large monorepos by checking out only the specific directories you need. This significantly reduces the local file footprint while maintaining the full repository structure.

How do I resolve merge conflicts when rebasing?▼

Advanced conflict resolution strategies guide you through resolving merge conflicts that arise during rebasing. The tool helps identify conflicting changes and provides the correct sequence of commands to continue.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
nsheapsnsheaps
3

update-branch

Synchronize feature branches with their PR base using git and gh.

Community
Advanced
arbazkhan971arbazkhan971
26

ship

Automate shipping code changes with pre-ship checks, dry-run, execution, verification, and rollback.

Community
Advanced
ahoymahoym
2

git-preview-conflicts

Identify conflicting files between Git branches without executing a merge.

Community
Intermediate