Skip to content

Commit 5eee5d8

Browse files
LemmingAvalanchegitster
authored andcommitted
doc: diff-options.adoc: show format.noprefix for format-patch
git-format-patch(1) uses `format.noprefix` and ignores `diff.noprefix`. The configuration variable `format.prefix` was added as an “escape hatch”, and “it’s unlikely that anybody really wants format. noprefix=true in the first place.”[1] Based on that there doesn’t seem to be a need to widely advertise this configuration variable. But in any case: the documentation for this option should not claim that it overrides a config that is always ignored. † 1: 8d5213d (format-patch: add format.noprefix option, 2023-03-09) Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 04657ac commit 5eee5d8

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

Documentation/diff-options.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,9 @@ endif::git-format-patch[]
860860

861861
`--default-prefix`::
862862
Use the default source and destination prefixes ("a/" and "b/").
863-
This overrides configuration variables such as `diff.noprefix`,
863+
This overrides configuration variables such as
864+
ifndef::git-format-patch[`diff.noprefix`,]
865+
ifdef::git-format-patch[`format.noprefix`,]
864866
`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
865867
(see linkgit:git-config[1]).
866868

0 commit comments

Comments
 (0)