القائمة
Use jujutsu (jj) for all version control operations including commits, branches, merges, rebases, and repository management. Handles git workflow translation to jj equivalents.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
| name | Jujutsu Version Control |
| description | Use jujutsu (jj) for all version control operations including commits, branches, merges, rebases, and repository management. Handles git workflow translation to jj equivalents. |
This skill ensures Claude uses jujutsu (jj) as the primary version control system for all VCS operations in this repository.
Prefer jj for all VCS actions; translate git requests to jj.
When users reference version control operations using git terminology, automatically translate them to jujutsu equivalents. Only fall back to git if jujutsu is unavailable and the user explicitly approves.
When Claude creates commits in this repository:
Commit Attribution: Every AI-generated commit should include @claude in the commit title for immediate transparency.
Add feature X @claude or Fix bug in Y @claude@claude is sufficientExamples:
Add jujutsu skill documentation @claudeFix timeout handling @claudeRefactor service.py @claudeThis skill activates when users mention:
Keyword Tripwires: git, repo, commit, branch, merge, rebase, bookmark, workspace, revset, working-copy
In jujutsu, the working copy is itself a commit:
@ represents the working-copy commit (equivalent to git's "working directory + staging area")@- represents the parent of the working-copy commit@ without explicit stagingJujutsu uses bookmarks instead of branches:
jj bookmark commandsjj bookmark set <name>--track for remote trackingWorkspaces allow multiple working copies of the same repository:
Jujutsu can colocate with git repositories:
jj git init creates a jj repo that tracks a git repojj git clone clones a git repository with jj trackingjj git push and jj git fetch sync with git remotes| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git status | jj status | Shows working-copy changes |
git log | jj log | Visual graph of commits |
git log --oneline | jj log -r ::@ | Ancestors of working-copy |
git log --stat | jj log --summary | Show commits with modified files |
git show | jj show | Show current commit with full diff |
git show <commit> | jj show <commit> | Show specific commit with diff |
git show --format=fuller | jj show --git | Show commit in git diff format (clearer) |
git diff | jj diff --git | Changes in @ (defaults to -r @) |
git diff <commit> | jj diff --git -r <commit> | Changes in a specific commit |
git diff HEAD | jj diff --git --from @ --to @ | Working copy vs @ (usually empty) |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git commit -m "msg" | jj commit -m "msg" | Creates new commit, starts new working-copy |
git commit --amend | jj describe -m "msg" | Update current working-copy message |
git add <file> | (automatic) | Changes are auto-tracked in @ |
git reset <file> | jj restore <file> | Discard working-copy changes |
git commit --fixup | jj squash | Squash working-copy into parent |
| (AI workflow) | jj status → check @ → commit existing → edit → commit @claude | Separate user/AI changesets |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git checkout <commit> | jj edit <commit> | Edit a commit directly |
git rebase -i | jj rebase + jj squash/split | More granular operations |
git cherry-pick | jj duplicate + jj rebase | Copy and move commits |
git reset --hard | jj abandon @ | Abandon working-copy commit |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git branch <name> | jj bookmark create <name> | Create bookmark at current commit |
git checkout -b <name> | jj bookmark create <name> + jj edit @ | Create and stay at commit |
git branch -d <name> | jj bookmark delete <name> | Delete bookmark |
git checkout <branch> | jj new <bookmark> | Create new working-copy on bookmark |
git merge <branch> | jj merge <bookmark> @ | Create merge commit |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git reset --hard HEAD~1 | jj undo | Undo last operation |
git reflog | jj op log | View operation history |
git reset --hard <op> | jj op restore <op> | Restore to specific operation |
git stash | jj new | Create new working-copy (keeps changes) |
git stash pop | jj squash | Squash changes back |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git clone <url> | jj git clone <url> | Clone with git backend |
git pull | jj git fetch + jj rebase | Fetch and update |
git push | jj git push | Push bookmarks to remote |
git fetch | jj git fetch | Fetch from remotes |
| Git Command | Jujutsu Equivalent | Notes |
|---|---|---|
git mv <old> <new> | jj file move <old> <new> | Move/rename file |
git rm <file> | rm <file> | Just delete the file |
git clean -fd | jj restore --from @- | Restore from parent |
# Make changes to files
jj status # Review changes
jj commit -m "description" # Create commit from working-copy
# Working-copy is now a new empty commit on top
# Make more changes
jj describe -m "updated description" # Update message
jj squash # Squash into parent (alternative)
jj bookmark create feature-name # Create bookmark at @
jj describe -m "feature: ..." # Describe the change
jj commit -m "feature: part 2" # Continue work
jj bookmark set feature-name # Move bookmark to @ (if needed)
jj split # Interactively split current commit
# OR
jj split <file1> <file2> # Split specific files into new commit
jj log # Visual graph of all commits
jj log -r ::@ # Ancestors of working-copy
jj log -r @- # Parent commit
jj log -r 'bookmarks()' # All bookmarked commits
jj log --summary # Show commits with list of modified files
jj show # Show current commit (@) with description and full diff
jj show --git # Same but in clearer git diff format (recommended)
jj show <revision> # Show specific commit with changes
jj diff --git -r @ # Show changes in current commit (same as jj diff)
jj diff --git -r <revision> # Show changes in specific revision
Important: jj diff --git by default shows changes IN the current commit @, NOT uncommitted working copy changes (since the working copy IS the commit @ in jujutsu).
jj op log # View operation history
jj undo # Undo last operation
jj op restore <op-id> # Restore to specific operation
When making file changes, follow this pattern to keep AI and human changesets separate:
Check current working-copy status:
jj status # Check if @ has changes
jj log -r @ # Check description and @claude tag
If @ has changes:
Case A: Description contains @claude (previous AI work)
# Commit previous AI work to keep changesets separate
jj commit
Case B: Description does NOT contain @claude (user work)
# If no description set: auto-describe from diff
jj diff --git # Review changes
jj describe -m "<description from diff>" # Describe user's changes
jj commit # Commit user work
# If description already exists: ASK user before proceeding
# Don't auto-change existing descriptions - verify first
Make your new changes (Edit/Write files)
Format Nix files if modified:
nixfmt **/*.nix # Format all Nix files before committing
Describe and commit the new AI changes:
jj describe -m "Your change description @claude"
jj commit
Key Principles:
When to use: Recommended for all tasks involving file edits.
@claude attribution in all AI-generated commit titles: Makes AI involvement immediately obvious in historynixfmt **/*.nix before any commit to ensure consistent formattingjj status before making edits: Handle existing changes cleanly by committing them firstjj log outputjj op log is your safety net - you can always undojj bookmark set: Remember to move bookmarks when needed (they don't auto-advance)jj op log tracks every action for easy undomain, master, or trunk bookmarks - these are managed by humans onlyBased on the nix-csi repository:
jj log)If jj is not installed:
cargo install jj-cli or system package manager