tidy-unpushed-commits

Squash, reorder, and rewrite unpushed Git commits while preserving the final tree.

Updated Nov 12, 2017
One-click install
npx skills add https://github.com/ak110/dotfiles --skill tidy-unpushed-commits
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: tidy-unpushed-commits
Source: https://github.com/ak110/dotfiles/tree/main/plugins/agent-toolkit/skills/tidy-unpushed-commits
Command: npx skills add https://github.com/ak110/dotfiles --skill tidy-unpushed-commits

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

未プッシュコミットをsquash・reorder・メッセージ書き直しして、最終ツリーの同一性を保証しつつ整理する。 破壊的な操作(git reset --hard など)を避け、安全な手順で進める。

Core Features & Use Cases

  • 未プッシュコミットを安全に再構成し、履歴を読みやすく整える。
  • 整理の前に適用条件を判定し、amend/fixupなどの既存指示と衝突させない設計。
  • 退避refと差分検証を用いて、最終ツリーの一致を検証する。

Quick Start

未プッシュコミットをsquash・reorder・メッセージ書き直しして、最終ツリーの同一性を維持する実行計画を作成してください。

Frequently Asked Questions about tidy-unpushed-commits

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

FAQPage Schema
How do I squash and reorder unpushed git commits safely?

To squash and reorder unpushed git commits safely, this skill creates an execution plan that reorganizes local history while preserving the final tree. It avoids destructive operations like hard resets and uses backup refs with diff checks to guarantee history integrity.

What is the best way to tidy local git history before pushing?

The best way to tidy local git history before pushing is to squash, reorder, and rewrite messages while validating that the final tree remains identical. This approach enforces non-destructive workflows and Git command discipline to guarantee history integrity.

Can I rewrite commit messages on unpushed commits without losing changes?

Yes, you can rewrite commit messages on unpushed commits without losing changes. The skill preserves the final tree by using a backup ref and diff verification, ensuring that reordering or squashing does not alter your actual code modifications.

Does tidying unpushed commits work with uncommitted changes in the working directory?

Tidying unpushed commits handles uncommitted changes by incorporating them into the safety workflow. The skill evaluates application conditions before reorganizing to ensure that existing amend or fixup instructions do not conflict with the tidying process.

Why should I avoid git reset --hard when reorganizing local commits?

You should avoid git reset --hard when reorganizing local commits because it is a destructive operation that can permanently discard work. This skill enforces non-destructive workflows with backup refs and diff checks to guarantee history integrity instead.