Skip to content

Commit ea3a62c

Browse files
LemmingAvalanchegitster
authored andcommitted
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>
1 parent 5eee5d8 commit ea3a62c

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

Documentation/diff-options.adoc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -859,12 +859,18 @@ endif::git-format-patch[]
859859
Do not show any source or destination prefix.
860860

861861
`--default-prefix`::
862+
ifdef::git-format-patch[]
862863
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`,
866865
`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
867866
(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[]
868874

869875
`--line-prefix=<prefix>`::
870876
Prepend an additional _<prefix>_ to every line of output.

0 commit comments

Comments
 (0)