trailer doc: narrow down scope of --where and related flags
The wording "all configuration variables" is misleading (the same could be said to the descriptions of the "--[no-]if-exists" and the "--[no-]if-missing" options). Specifying --where=value overrides only the trailer.where variable and applicable trailer.<token>.where variables, and --no-where stops the overriding of these variables. Ditto for the other two with their relevant configuration variables. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Arver committed
Sep 7, 2023 at 22:20 UTC
f659c56a8c43ce3d6e44c926ef2eb3883a4809e0
1 file changed
+6
-3
Documentation/git-interpret-trailers.txt
+6
-3
@@ -112,7 +112,8 @@ OPTIONS
112
--where <placement>::
113
--no-where::
114
Specify where all new trailers will be added. A setting
115
- provided with '--where' overrides all configuration variables
115
+ provided with '--where' overrides the `trailer.where` and any
116
+ applicable `trailer.<token>.where` configuration variables
117
and applies to all '--trailer' options until the next occurrence of
118
'--where' or '--no-where'. Upon encountering '--no-where', clear the
119
effect of any previous use of '--where', such that the relevant configuration
@@ -123,7 +124,8 @@ OPTIONS
124
--no-if-exists::
125
Specify what action will be performed when there is already at
126
least one trailer with the same <token> in the input. A setting
126
- provided with '--if-exists' overrides all configuration variables
127
+ provided with '--if-exists' overrides the `trailer.ifExists` and any
128
+ applicable `trailer.<token>.ifExists` configuration variables
129
and applies to all '--trailer' options until the next occurrence of
130
'--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the
131
effect of any previous use of '--if-exists, such that the relevant configuration
@@ -134,7 +136,8 @@ OPTIONS
136
--no-if-missing::
137
Specify what action will be performed when there is no other
138
trailer with the same <token> in the input. A setting
137
- provided with '--if-missing' overrides all configuration variables
139
+ provided with '--if-missing' overrides the `trailer.ifMissing` and any
140
+ applicable `trailer.<token>.ifMissing` configuration variables
141
and applies to all '--trailer' options until the next occurrence of
142
'--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing,
143
clear the effect of any previous use of '--if-missing, such that the relevant