mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 07:20:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

tutorial: edits to the diff editor explanation

Browse source 
Follows up on #3599. I also moved the discussion of other diff editors to a
footnote, as it didn't seem to fit well into the flow of the text.
This commit is contained in:
Ilya Grigoriev 2024-05-04 22:24:03 -07:00
parent 3dab92d2e9
commit 638649b435
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
docs/tutorial.md
View file

@ -441,14 +441,19 @@ 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, 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.
That will bring up the built-in diff editor[^alternative_diff_editors] with a
diff of the changes in the "ABCD" commit. 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. You can also use the mouse to click on the menu items to see more
options (keyboard navigation is currently limited).
[^alternative_diff_editors]: There are many other diff editors you could use.
For example, if you have [Meld](https://meldmerge.org) installed and in the
PATH, you can use it via `jj squash -i --tool meld` or a fancier config with `jj
squash -i --tool meld-3`. You can configure the default with the
[`ui.diff-editor` option](config.md#editing-diffs); those docs also explain how
to specify a path to an executable if it is not in the PATH.
If we look at the diff of the second commit, we now see
that all three lines got capitalized: