feat(tidy-commits): add commit-history tidying skill#17
Merged
Conversation
Add a skill that tidies a local branch's commit history into a clear, reviewable story before review or merge — squash fixups, reword, reorder, split, or drop while preserving the final tree. Covers preflight + backup ref, non-interactive rebase with todo generation and recovery, stacked-branch --update-refs, signature handling, and force-with-lease push safety. Adds a content test and CI workflow.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds the
tidy-commitsskill: a guide for tidying a local branch's commit history into a clear, reviewable story before review or merge — squash fixups, reword, reorder, split, or drop commits while preserving the intended final tree.Highlights:
reset --soft <base>shortcut for collapse-all, plus theGIT_SEQUENCE_EDITORtodo flow (generated oldest-first viagit log --reverse) for selective fixup/reorder/split, with recovery steps.--update-refsby default; flag refs checked out in other worktrees.--force;--force-with-leaseonly, with confirmation.Includes a content test (
tests/tidy-commits-content.sh) and a CI workflow (.github/workflows/test-tidy-commits.yml), plus a README entry.Test plan
bash tests/tidy-commits-content.shpasses (12 content assertions)main