What is the benefit of rebasing over merging?

Rebasing creates a clean, linear project history by moving your feature branch's base to the latest commit on the main branch, avoiding unnecessary merge commits.

Can I work on two branches simultaneously?

Yes, using Git Worktrees allows you to have multiple branches checked out in separate directories at the same time without needing to stash your current progress.

How does Git Bisect help with debugging?

Git Bisect uses a binary search algorithm to traverse your commit history, helping you quickly identify the exact change that introduced a bug or regression.

Is it safe to force push after a rebase?

This skill recommends using 'git push --force-with-lease', which is a safer alternative that prevents you from accidentally overwriting a teammate's work.

Can I use this skill to recover deleted code?

Yes, the skill provides guidance on using the Git Reflog to find and restore commits or branches that were deleted or lost during resets within the last 90 days.

Git Advanced Workflows

Name: Git Advanced Workflows
Author: HermeticOrmus

byHermeticOrmus

デプロイメントとDevOps

Master advanced Git version control techniques including interactive rebasing, bisecting, and history recovery to maintain professional repositories.

概要

The Git Advanced Workflows skill provides specialized guidance for managing complex repository histories and resolving difficult version control scenarios. It enables Claude to assist with interactive rebasing for clean PRs, using git bisect to find bug-introducing commits, managing multiple worktrees for concurrent development, and leveraging the reflog to recover from accidental data loss. This skill is essential for developers working in team environments where maintaining a clean, linear, and searchable history is a priority.

主な機能

Selective commit application via advanced Cherry-Picking
Simultaneous multi-branch development with Git Worktrees
0 GitHub stars
Interactive rebase orchestration for commit squashing and history cleanup
Emergency data recovery using the Git Reflog
Automated and manual bug localization using Git Bisect

ユースケース

Identifying the specific commit that introduced a regression in a legacy codebase
Cleaning and organizing local commit history before submitting a pull request
Recovering work after a destructive operation like an accidental hard reset or branch deletion

概要

主な機能

Selective commit application via advanced Cherry-Picking
Simultaneous multi-branch development with Git Worktrees
0 GitHub stars
Interactive rebase orchestration for commit squashing and history cleanup
Emergency data recovery using the Git Reflog
Automated and manual bug localization using Git Bisect

ユースケース

Identifying the specific commit that introduced a regression in a legacy codebase
Cleaning and organizing local commit history before submitting a pull request
Recovering work after a destructive operation like an accidental hard reset or branch deletion