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: 8d5213de (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>

Kristoffer Haugsbakk committed Feb 24, 2026 at 00:30 UTC 5eee5d81e42369e7e3b86dbc6f45e96c65c0bb1d
1 file changed +3 -1
Documentation/diff-options.adoc
+3 -1
@@ -860,7 +860,9 @@ endif::git-format-patch[]
860
861 `--default-prefix`::
862 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`,]
866 `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
867 (see linkgit:git-config[1]).
868