From: Kristoffer Haugsbakk Date: Mon, 23 Feb 2026 23:30:51 +0000 (+0100) Subject: doc: diff-options.adoc: show format.noprefix for format-patch X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=5eee5d81e42369e7e3b86dbc6f45e96c65c0bb1d;p=rit 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc index 9cdad6f72a..8f632d5fe1 100644 --- a/Documentation/diff-options.adoc +++ b/Documentation/diff-options.adoc @@ -860,7 +860,9 @@ endif::git-format-patch[] `--default-prefix`:: Use the default source and destination prefixes ("a/" and "b/"). - This overrides configuration variables such as `diff.noprefix`, + This overrides configuration variables such as +ifndef::git-format-patch[`diff.noprefix`,] +ifdef::git-format-patch[`format.noprefix`,] `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix` (see linkgit:git-config[1]).