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

docs: add tutorial on how to use :builtin diff editor #3599

Merged
merged 1 commit into from
May 3, 2024
Merged

docs: add tutorial on how to use :builtin diff editor #3599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions docs/tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,17 @@ Working copy now at: mrxqplyk 52a6c7fd ABCD
Parent commit : kwtuwqnm 643061ac ABC
```

That will bring up the built-in diff editor with a diff of the changes in
the "ABCD" commit. If you prefer another diff editor, you can configure
[`ui.diff-editor`](config.md#editing-diffs) instead. Modify the right side of
the diff to have the desired end state in "ABC" by removing the "D" line. Then
save the changes and close Meld. If we look at the diff of the second commit, we
now see that all three lines got capitalized:
That will bring up the built-in diff editor with a diff of the changes in the
"ABCD" commit. If you prefer another diff editor, such as
[Meld](https://meldmerge.org), you can configure
[`ui.diff-editor`](config.md#editing-diffs) instead. Expand the file by
clicking on `(+)` or with right arrow, then select the sections/line to include
by clicking or using space. Once complete, press `c` to confirm changes, or `q`
to exit without saving. We can also click on the menu items to see more
options.

If we look at the diff of the second commit, we now see
that all three lines got capitalized:

```shell
$ jj diff -r @-
Expand Down