cat:git-merge-linear
CommunityMerge task branches with a clean, linear history.
Authorcowwoc
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill merges a task branch into its base branch while preserving a linear history, enabling predictable integration from the task worktree.
Core Features & Use Cases
- Maintain a clean, linear Git history by squashing commits when needed.
- Perform a fast-forward merge directly to the base branch from the task worktree without checking out the base.
- Includes safeguards against base divergence and unintended deletions during merge.
Quick Start
From the task worktree, confirm the base branch using the cat-base file, ensure there are no uncommitted changes, squash multiple commits into a single commit if needed, push the fast-forward to HEAD:<BASE_BRANCH>, and finally clean up by removing the temporary worktree and deleting the task branch.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: cat:git-merge-linear Download link: https://github.com/cowwoc/cat/archive/main.zip#cat-git-merge-linear Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.