squash-commits

Consolidate unpushed commits into one conventional-commits-formatted commit.

Updated Aug 27, 2026
One-click install
npx skills add https://github.com/so-ota-biz/ai-agent-orchestration-settings --skill squash-commits-so-ota-biz
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: squash-commits
Source: https://github.com/so-ota-biz/ai-agent-orchestration-settings/tree/main/.agent/skills/squash_commits
Command: npx skills add https://github.com/so-ota-biz/ai-agent-orchestration-settings --skill squash-commits-so-ota-biz

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill helps you condense multiple unpushed commits on the current working branch into a single commit and proposes a conventional commits message, enabling clean local history.

Core Features & Use Cases

  • Local commit squashing: combine the unpushed commits into one.
  • Conventional Commits messaging: suggests a compliant commit message.
  • Safety checks: confirms before squashing and excludes pushed commits; avoids destructive actions.

Quick Start

Run the squash-commits skill on a feature branch to reduce its local history to a single, clearly described commit.

Frequently Asked Questions about squash-commits

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

FAQPage Schema
How do I squash local commits into one conventional commit before pushing?

To squash local commits into one conventional commit, this skill consolidates unpushed commits on your current branch and proposes a conventional-commits-formatted message, requiring your confirmation before applying the changes.

Can I squash commits on a feature branch without affecting pushed commits?

Yes, you can squash commits without affecting pushed commits. The skill includes safety checks that exclude already pushed commits and only consolidates your local development history on the current branch.

Does squashing local commits offer a dry run to preview the changes?

Yes, squashing local commits includes a dry run. The skill shows you a preview of the proposed single commit and asks for user confirmation before performing any destructive actions.

What is the best way to clean up local git history for a PR?

The best way to clean up local git history for a PR is to squash unpushed feature branch commits into a single, clearly described commit using a generated conventional commit message.

Will the squashed commit message automatically follow the conventional commits format?

Yes, the squashed commit message automatically follows the conventional commits format. The skill analyzes your local history and suggests a compliant commit message for the consolidated changes.