Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: add jj operation show and jj operation diff commands #3617

Merged
merged 4 commits into from
Jul 22, 2024
Merged

cli: add jj operation show and jj operation diff commands #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cb0c03
repo: add `MutableRepo::merge_index`
bnjmnt4n May 2, 2024
496c905
repo: add `RepoLoader::merge_operations`
bnjmnt4n Jul 4, 2024
2e3256f
cli: add `jj operation diff` command
bnjmnt4n May 2, 2024
58594af
cli: add `jj operation show` command
bnjmnt4n May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

* New `diff_contains()` revset function can be used to search diffs.

* New command `jj operation diff` that can compare changes made between two
operations.

* New command `jj operation show` that can show the changes made in a single
operation.

### Fixed bugs

* `jj diff --git` no longer shows the contents of binary files.
Expand Down
Loading