feat(skills): add jj-commit-hygiene skill#123
Merged
Conversation
aguil
force-pushed
the
feat/jj-commit-hygiene
branch
2 times, most recently
from
July 15, 2026 00:54
ebfd49a to
2c60c99
Compare
aguil
force-pushed
the
feat/jj-commit-hygiene
branch
from
July 15, 2026 00:58
2c60c99 to
ca3f4c2
Compare
aguil
marked this pull request as ready for review
July 15, 2026 01:01
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
dot_agents/skills/jj-commit-hygiene/SKILL.md: patterns for keeping commits atomic during iterative development. Supplements the installedjujutsuskill and the existingjj-cross-reposkill.What it covers
The problem it solves: when operator feedback arrives mid-task, agents tend to keep editing
@instead of creating a new commit — mixing unrelated changes into one commit and spending time splitting them out retroactively.Gaps in the existing skills it fills:
jj stcheck before every editjj new @-creates a sibling, not an insertion — the old@is NOT automatically rebased; you mustjj rebase -r old@ -d newto linearize. Neither the basejujutsuskill norjj-cross-repodocuments this gotcha.jj squash --from X --into Y -- <files>— the correct tool for retroactive splitting; existing skills only show destructive "abandon and re-create" or interactive formsbookmark@(remote tracking, read-only) frombookmark(local, writable) and the commands to fix a stale local bookmark after restructuringContext
Distilled from observations across multiple iterative task sessions, specifically the pattern of @ accumulating feedback-driven changes that then needed splitting at PR review time.
Relationship to existing skills
jujutsuskill (kept as reference)jj-cross-repo(that skill handles workspace/multi-repo mechanics; this one handles commit discipline)