global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-04 06:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

doc: diff-options.adoc: make *.noprefix split translatable

Browse Source 
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>
This commit is contained in:
Kristoffer Haugsbakk
2026-03-01 20:21:14 +01:00
committed by Junio C Hamano
parent 5eee5d81e4
commit ea3a62c40e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/diff-options.adoc
View File

@@ -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.