kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kh/format-patch-noprefix-is-boolean' into next 

The configuration variable format.noprefix did not behave as a
proper boolean variable, which has now been fixed and documented.

* kh/format-patch-noprefix-is-boolean:
  doc: diff-options.adoc: make *.noprefix split translatable
next
Junio C Hamano 2026-03-03 13:41:19 -08:00
parent 1c1a636109 ea3a62c40e
commit 54bc051969
1 changed files with 9 additions and 3 deletions
Show Stats 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.