Is this skill useful for Git users?

Yes, because Jujutsu can be used as a front-end for Git repositories, allowing you to use these advanced history manipulation tools on your existing Git projects.

What is Jujutsu (jj)?

Jujutsu is a Git-compatible version control system that provides a more powerful and flexible way to manage commit history and working copies.

How do I handle immutable commits in jj?

The skill includes instructions on using the --ignore-immutable flag to rewrite history that has already been built upon or pushed.

Can this skill help me fix merge conflicts?

Yes, it provides specific workflows for identifying, resolving, and squashing conflicts using the jj resolve and jj squash commands.

JJ History Investigation & Manipulation

Name: JJ History Investigation & Manipulation
Author: edmundmiller

byedmundmiller

•

Developer Tools

Investigates and restructures Jujutsu (jj) version control history through commit splitting, annotation, and conflict resolution.

This skill provides specialized guidance for working with Jujutsu (jj) repositories, enabling users to efficiently navigate historical commits, break down monolithic changes into focused pieces, and manage complex rebase operations. It offers advanced techniques for handling immutable commits, removing redundant history, and performing line-by-line change tracking, making it an essential tool for developers who prioritize maintaining clean, logical, and reviewable codebase histories.

Key Features

01Automated identification and cleanup of redundant or empty commits

02Granular commit splitting workflows for monolithic changes

0342 GitHub stars

04Deep history investigation and metadata extraction

05Advanced immutability override techniques for history rewriting

06Step-by-step conflict resolution for complex rebase scenarios

Use Cases

01Splitting a large monolithic commit into smaller, logical pieces for easier code review

02Cleaning up messy local history by removing duplicate or empty commits before pushing to a remote

03Debugging code regressions by tracking exactly when and why specific lines were modified

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmundmiller/dotfiles jj-history-investigation

For use in Claude.ai and ChatGPT

Download Skill