Skip to content

Commit f659c56

Browse files
Linus Arvergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Linus Arver <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 73574f2 commit f659c56

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/git-interpret-trailers.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ OPTIONS
112112
--where <placement>::
113113
--no-where::
114114
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
116117
and applies to all '--trailer' options until the next occurrence of
117118
'--where' or '--no-where'. Upon encountering '--no-where', clear the
118119
effect of any previous use of '--where', such that the relevant configuration
@@ -123,7 +124,8 @@ OPTIONS
123124
--no-if-exists::
124125
Specify what action will be performed when there is already at
125126
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
127129
and applies to all '--trailer' options until the next occurrence of
128130
'--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the
129131
effect of any previous use of '--if-exists, such that the relevant configuration
@@ -134,7 +136,8 @@ OPTIONS
134136
--no-if-missing::
135137
Specify what action will be performed when there is no other
136138
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
138141
and applies to all '--trailer' options until the next occurrence of
139142
'--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing,
140143
clear the effect of any previous use of '--if-missing, such that the relevant

0 commit comments

Comments
 (0)