cli: Teach --diff to recurse into directories and add a MultiDiffView#45131
Merged
Veykril merged 2 commits intozed-industries:mainfrom Jan 30, 2026
Merged
cli: Teach --diff to recurse into directories and add a MultiDiffView#45131Veykril merged 2 commits intozed-industries:mainfrom
--diff to recurse into directories and add a MultiDiffView#45131Veykril merged 2 commits intozed-industries:mainfrom
Conversation
ce68b3e to
06ea56e
Compare
Veykril
reviewed
Jan 5, 2026
06ea56e to
7ee075c
Compare
--diff-all cli option and corresponding MultiDiffView--diff to recurse into directories and add a MultiDiffView
Veykril
reviewed
Jan 16, 2026
7ee075c to
0ae67fc
Compare
The --diff option now auto-detects when directories are passed and automatically recurses into them to find all files to diff.
0ae67fc to
03f6ffa
Compare
--diff to recurse into directories and add a MultiDiffView--diff to recurse into directories and add a MultiDiffView
|
With the jj config provided, doesn't seem to work on macOS. |
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
4 participants
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.
This branch:
--diffcommand line option to to recurse into folders if provided.MultiDiffViewthat shows all changed files in a single, scrollable view.This is necessary to provide a smooth user experience for
jjand Zed users who wish to use Zed as their jj difftool.I'm not fully sure how this change interacts with #44936, or what plans y'all have in mind.
Here's a screenshot of the resulting behavior:
I setup zed to handle jj diffs by adding the following to my jj config:
Release Notes:
--diff, if provided with folders instead of files, will recurse into those directories.MultiDiffView, which will show all changed files within a single, scrollable view.AI Disclosure: Pretty much all of this code was written using Codex with GPT-5.1-Codex. I edited by hand and tested this.