Squash and organize branch commits into logical groups, then push with force-with-lease.
npx skills add https://github.com/mjun0812/skills --skill git-squash-mjun0812
Please help me install this Agent Skill. Skill: git-squash Source: https://github.com/mjun0812/skills/tree/main/skills/git/git-squash Command: npx skills add https://github.com/mjun0812/skills --skill git-squash-mjun0812
--one flag. - Safe Execution: Aborts automatically on the default branch, uncommitted changes, missing upstream commits, or force-with-lease failures, never falling back to --force. - Dry-Run and Language Support: Preview the grouping plan and generated commit messages with --dry-run, and produce commit messages and reports in a specified language. - Use Case: Before merging a feature branch with 12 WIP commits, run this Skill to condense them into 3 well-structured Conventional Commits and push with --force-with-lease. ## Quick Start Squash and tidy the commits on my current branch, then push with force-with-lease.High-intent search queries and answers about installing and using this skill.
Invoke the skill on your feature branch and it resets softly to the base branch, regroups changes into logical Conventional Commits, and pushes with force-with-lease. Use the --one flag to collapse everything into a single commit.
Pass the --dry-run flag to see the proposed grouping and new commit messages without performing any reset, commit, or push. This lets you review the plan before any history is rewritten.
Yes, use the --no-push flag to perform the squash locally only. The skill then reports the exact push command you can run manually when ready.
The skill refuses to run when the working tree has uncommitted modifications to prevent accidental data loss. Commit or stash your changes manually first, since the skill never stashes or commits automatically.
The skill only uses git push --force-with-lease, which fails if the remote has commits you have not fetched. It never falls back to plain --force, and it aborts if the upstream contains unpulled commits.
bdsqqqRecreate the current branch with clean, narrative commit history.
ivanov-iRewrite a feature branch onto a clean branch off main with narrative commits.
SocketDevSquash all main branch commits into one Initial commit with backup and diff checks.
SeleznovIvanManage Git merges, rebases, and commit history across branches.