doc: diff-options.adoc: make *.noprefix split translatable
We cannot split single words like what we did in the previous commit. That is because the doc translations are processed in bigger chunks. Instead write the two paragraphs with the only variations being this configuration variable. Reported-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kristoffer Haugsbakk committed
Mar 1, 2026 at 20:21 UTC
ea3a62c40ef2d31a6ab87ae3b8be46690d549b58
1 file changed
+9
-3
Documentation/diff-options.adoc
+9
-3
index 8f632d5fe1..fcfcdf0286 100644
--- a/Documentation/diff-options.adoc
+++ b/Documentation/diff-options.adoc
@@ -859,12 +859,18 @@ endif::git-format-patch[]
Do not show any source or destination prefix.
`--default-prefix`::
+ifdef::git-format-patch[]
Use the default source and destination prefixes ("a/" and "b/").
- This overrides configuration variables such as
-ifndef::git-format-patch[`diff.noprefix`,]
-ifdef::git-format-patch[`format.noprefix`,]
+ This overrides configuration variables such as `format.noprefix`,
`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
(see linkgit:git-config[1]).
+endif::git-format-patch[]
+ifndef::git-format-patch[]
+ Use the default source and destination prefixes ("a/" and "b/").
+ This overrides configuration variables such as `diff.noprefix`,
+ `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
+ (see linkgit:git-config[1]).
+endif::git-format-patch[]
`--line-prefix=<prefix>`::
Prepend an additional _<prefix>_ to every line of output.