jj (Jujutsu)
0jj is a version control tool that coexists with Git, focusing on changes rather than branches. It is designed for agent-assisted development workflows, allowing users to manage changes seamlessly without a staging area.
2200Updated 2mo ago
Version Control
Quick InstallView Source
$ npx skills add https://github.com/onevcat/skills --skill onevcat-jjOverview
About This Skill
jj is a version control tool created by onevcat that operates alongside Git, emphasizing change-based workflows rather than branch-centric development. It eliminates the traditional staging area, allowing developers to manage changes more directly. jj is specifically designed to support agent-assisted development workflows, making it suitable for environments where AI agents collaborate with version control systems.
How to Use
Install using the command: `$ npx skills add https://github.com/onevcat/skills --skill onevcat-jj`
Use Cases
Managing agent-assisted development workflows
Tracking modifications without staging
Working with remote Git repositories using bookmarks
Tags
Setup & Installation
Quick Install
Terminal
$ npx skills add https://github.com/onevcat/skills --skill onevcat-jjAlternative Install (Git Clone)
git clone https://github.com/onevcat/skillsRequirements
- Claude Code or compatible AI agent
Quick Start Guide
1
Install the Skill
Copy the install command above and run it in your terminal.
2
Open Your AI Agent
Launch Claude Code, Cursor, or your preferred AI coding agent.
3
Try It Out
Use the prompt template or examples below to test the skill.
4
Customize
Adapt the skill to your specific use case and workflow.
Usage Examples
Prompt Template
Act as a jj (Jujutsu) expert and help me [DESCRIBE YOUR GOAL: e.g., 'rebase my changes onto the latest main branch', 'split a large commit into smaller ones', 'resolve a merge conflict']. Use the following data: [CURRENT_BRANCH], [TARGET_BRANCH], [FILES_TO_STAGE], [COMMIT_MESSAGE].
Example Output
# Jujutsu Workflow Assistance ## Current State Your repository has the following state: - **Current branch**: `feature/user-auth` - **Target branch**: `main` - **Uncommitted changes**: `auth.py`, `tests/auth_test.py` - **Last commit**: `Fix login endpoint edge case` ## Recommended Steps ### 1. Check your current changes ```bash jj status ``` This shows all modified files and their change status. ### 2. Create a new change for your modifications ```bash jj new ``` This creates a new change with your current modifications. ### 3. Split large changes into smaller ones (if needed) ```bash jj split ``` Select which parts to move to a new change. ### 4. Rebase onto main branch ```bash jj rebase -d main ``` This updates your changes to be based on the latest main branch. ### 5. Resolve any conflicts ```bash jj resolve --conflict <file> ``` Edit the file to resolve conflicts, then mark as resolved. ### 6. Finalize your changes ```bash jj squash -r ``` This combines related changes into logical commits. ## Next Steps After completing these steps, you can: - Push your changes using `jj git push` - Create a new change with `jj new` - View change history with `jj log` Would you like me to explain any of these steps in more detail?
Find the right skills for your stack
Take a free 3-minute scan and get personalized AI skill recommendations.
Take free scan