From 2fa25bda39dc34c5fbcb75ef3808b41a8bc02b48 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sat, 4 May 2024 22:24:03 -0700 Subject: [PATCH] tutorial: edits to the diff editor explanation 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. --- docs/tutorial.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/docs/tutorial.md b/docs/tutorial.md index ef08551b1f..caafab32b6 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -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: