Do I need to be in a Git worktree to use this skill?

Yes, this skill is specifically designed to run within a task worktree. It uses local metadata to identify the base branch and ensures your main repository remains untouched during the task.

How does the skill handle multiple commits on my task branch?

The skill automatically detects if you have more than one commit and squashes them into a single commit, using the first commit message as the header and listing all subsequent messages as changes.

What is the benefit of a linear Git history?

A linear history avoids merge commits, making the project timeline easier to read, simplify debugging with git bisect, and providing a cleaner log of feature additions.

Will this skill delete my work tree after merging?

Yes, upon a successful and verified merge, the skill automatically removes the task worktree and deletes the local task branch to keep your environment clean.

Git Linear Merge for Worktrees

Name: Git Linear Merge for Worktrees
Author: cowwoc

bycowwoc

•

Herramientas para Desarrolladores

Automates the process of merging task branches into base branches using linear history and worktree-aware workflows.

This skill streamlines the Git development cycle by automating the process of merging completed tasks back into base branches like main or develop while operating directly within a Git worktree. It enables developers to fast-forward the base branch without checking it out, automatically squashes multiple commits into a single clean entry with co-author attribution, and performs essential post-merge cleanup. By ensuring a linear history and removing used worktrees and branches, it maintains repository health and developer focus without the overhead of manual context switching.

Características Principales

012 GitHub stars

02Worktree-aware execution to prevent main repository clutter

03Automatic commit squashing for clean, linear project history

04Integrated verification steps and fail-fast error handling

05Fast-forward base branches without manual checkout

06Automated cleanup of task branches and worktree directories

Casos de Uso

01Managing high-volume task-based workflows using Git worktrees

02Consolidating multiple development commits into a single atomic change

03Landing reviewed task branches into production-ready base branches

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cowwoc/claude-code-cat git-merge-linear

For use in Claude.ai and ChatGPT

Download Skill