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
@@ -859,12 +859,18 @@ endif::git-format-patch[]
859
Do not show any source or destination prefix.
860
861
`--default-prefix`::
862
+ifdef::git-format-patch[]
863
Use the default source and destination prefixes ("a/" and "b/").
863
- This overrides configuration variables such as
864
-ifndef::git-format-patch[`diff.noprefix`,]
865
-ifdef::git-format-patch[`format.noprefix`,]
864
+ This overrides configuration variables such as `format.noprefix`,
865
`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
866
(see linkgit:git-config[1]).
867
+endif::git-format-patch[]
868
+ifndef::git-format-patch[]
869
+ Use the default source and destination prefixes ("a/" and "b/").
870
+ This overrides configuration variables such as `diff.noprefix`,
871
+ `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
872
+ (see linkgit:git-config[1]).
873
+endif::git-format-patch[]
874
875
`--line-prefix=<prefix>`::
876
Prepend an additional _<prefix>_ to every line of output.