From 22e4693c573b743f02a2e108b701ef92c4817c4e Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Tue, 11 Feb 2025 08:44:57 -0800 Subject: [PATCH] Document usage with jj --- manual/src/SUMMARY.md | 1 + manual/src/jj.md | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 manual/src/jj.md diff --git a/manual/src/SUMMARY.md b/manual/src/SUMMARY.md index 2a6f371fc..079a53122 100644 --- a/manual/src/SUMMARY.md +++ b/manual/src/SUMMARY.md @@ -7,6 +7,7 @@ - [Git](./git.md) - [Mercurial](./mercurial.md) - [Fossil](./fossil.md) + - [Jujutsu](./jj.md) - [Languages Supported](./languages_supported.md) - [Language Detection](./language_detection.md) - [Internals: Parsing](./parsing.md) diff --git a/manual/src/jj.md b/manual/src/jj.md new file mode 100644 index 000000000..a9011ad00 --- /dev/null +++ b/manual/src/jj.md @@ -0,0 +1,15 @@ +# Jujutsu + +Jujutsu supports [external diff +commands](https://jj-vcs.github.io/jj/v0.26.0/config/#generating-diffs-by-external-command). + +To use difftastic for diffing in jujutsu, add the following to your +[user configuration +file](https://jj-vcs.github.io/jj/v0.26.0/config/#user-config-file). + +```toml +[ui] +diff.tool = ["difft", "--color=always", "$left", "$right"] +``` + +