diff --git a/cli/src/commands/diffedit.rs b/cli/src/commands/diffedit.rs index ad0eeaf010..5d2136c27d 100644 --- a/cli/src/commands/diffedit.rs +++ b/cli/src/commands/diffedit.rs @@ -25,11 +25,14 @@ use crate::ui::Ui; /// Touch up the content changes in a revision with a diff editor /// -/// With the `-r` option, which is the default, starts a diff editor (`meld` by -/// default) on the changes in the revision. +/// With the `-r` option, which is the default, starts a [diff editor] on the +/// changes in the revision. /// -/// With the `--from` and/or `--to` options, starts a diff editor comparing the -/// "from" revision to the "to" revision. +/// With the `--from` and/or `--to` options, starts a [diff editor] comparing +/// the "from" revision to the "to" revision. +/// +/// [diff editor]: +/// https://martinvonz.github.io/jj/latest/config/#editing-diffs /// /// Edit the right side of the diff until it looks the way you want. Once you /// close the editor, the revision specified with `-r` or `--to` will be diff --git a/cli/src/commands/split.rs b/cli/src/commands/split.rs index af83bfda07..ff6b8ac044 100644 --- a/cli/src/commands/split.rs +++ b/cli/src/commands/split.rs @@ -30,11 +30,13 @@ use crate::ui::Ui; /// Split a revision in two /// -/// Starts a diff editor (`meld` by default) on the changes in the revision. -/// Edit the right side of the diff until it has the content you want in the -/// first revision. Once you close the editor, your edited content will replace -/// the previous revision. The remaining changes will be put in a new revision -/// on top. +/// Starts a [diff editor] on the changes in the revision. Edit the right side +/// of the diff until it has the content you want in the first revision. Once +/// you close the editor, your edited content will replace the previous +/// revision. The remaining changes will be put in a new revision on top. +/// +/// [diff editor]: +/// https://martinvonz.github.io/jj/latest/config/#editing-diffs /// /// If the change you split had a description, you will be asked to enter a /// change description for each commit. If the change did not have a diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index 65b1da040a..6a0bfaaf63 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -673,9 +673,11 @@ With the `--from` and/or `--to` options, shows the difference from/to the given Touch up the content changes in a revision with a diff editor -With the `-r` option, which is the default, starts a diff editor (`meld` by default) on the changes in the revision. +With the `-r` option, which is the default, starts a [diff editor] on the changes in the revision. -With the `--from` and/or `--to` options, starts a diff editor comparing the "from" revision to the "to" revision. +With the `--from` and/or `--to` options, starts a [diff editor] comparing the "from" revision to the "to" revision. + +[diff editor]: https://martinvonz.github.io/jj/latest/config/#editing-diffs Edit the right side of the diff until it looks the way you want. Once you close the editor, the revision specified with `-r` or `--to` will be updated. Descendants will be rebased on top as usual, which may result in conflicts. @@ -1713,7 +1715,9 @@ Start an editor to update the patterns that are present in the working copy Split a revision in two -Starts a diff editor (`meld` by default) on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top. +Starts a [diff editor] on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top. + +[diff editor]: https://martinvonz.github.io/jj/latest/config/#editing-diffs If the change you split had a description, you will be asked to enter a change description for each commit. If the change did not have a description, the second part will not get a description, and you will be asked for a description only for the first part.