summaryrefslogtreecommitdiff
path: root/docs/typ/guide.typ
diff options
context:
space:
mode:
Diffstat (limited to 'docs/typ/guide.typ')
-rw-r--r--docs/typ/guide.typ15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/typ/guide.typ b/docs/typ/guide.typ
index 90e72303..89323766 100644
--- a/docs/typ/guide.typ
+++ b/docs/typ/guide.typ
@@ -202,8 +202,8 @@ takes the rows: #key("k") above, #key("j") below.
= Reviewing diffs <reviewing-diffs>
-`git diff` run as a command, or a `.diff` or `.patch` opened, is drawn as
-a diff, each hunk in its file's language. #btn("B3") on:
+`git diff` run as a command, or a `.diff` or `.patch` shown as text (below),
+is drawn as a diff, each hunk in its file's language. #btn("B3") on:
#pairs(
[`diff --git`, `---`, `+++`], [the file],
@@ -211,6 +211,17 @@ a diff, each hunk in its file's language. #btn("B3") on:
[a line's `+`, `-` or space], [that line in the new file],
)
+A `.diff` or `.patch` looked at, and a diff paged (`git show`), opens as
+a `+Diff`, stacked as delta shows one: each hunk under its `path:line`
+(`n`/`N` step through them, #btn("B3") opens it) and the declarations
+around it, a `+`/`-` before each line, the words a changed line changed
+tinted and a line added or removed whole faintly. A mailed patch keeps its
+message and diffstat above. The files are found from the diff's directory
+or one above it. #word("Diff") on a `+Diff` shows the diff itself as
+text (a paged one's `+Pager` is folded under it), and on the text stacks
+it again; #word("DiffLook") `text` in the startup file opens the text
+first.
+
= `pardes FILE` and `--wait` <editor>
In a pane's shell: