mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 23:10:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docs: update tutorial to include :builtin diff editor instructions

Browse source
This commit is contained in:
Charles Crete 2024-04-29 20:33:32 -04:00 committed by Cretezy
parent 7083530727
commit d9d60118a3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
docs/tutorial.md
View file

@ -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 @-