development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

trailer doc: narrow down scope of --where and related flags

Browse source 
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>
This commit is contained in:
Linus Arver 2023-09-07 22:20:00 +00:00 committed by Junio C Hamano
parent 73574f21b4
commit f659c56a8c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Documentation/git-interpret-trailers.txt
View file

@ -112,7 +112,8 @@ OPTIONS
--where <placement>:: --where <placement>::
--no-where:: --no-where::
Specify where all new trailers will be added. A setting Specify where all new trailers will be added. A setting
provided with '--where' overrides all configuration variables provided with '--where' overrides the `trailer.where` and any
applicable `trailer.<token>.where` configuration variables
and applies to all '--trailer' options until the next occurrence of and applies to all '--trailer' options until the next occurrence of
'--where' or '--no-where'. Upon encountering '--no-where', clear the '--where' or '--no-where'. Upon encountering '--no-where', clear the
effect of any previous use of '--where', such that the relevant configuration effect of any previous use of '--where', such that the relevant configuration
@ -123,7 +124,8 @@ OPTIONS
--no-if-exists:: --no-if-exists::
Specify what action will be performed when there is already at Specify what action will be performed when there is already at
least one trailer with the same <token> in the input. A setting least one trailer with the same <token> in the input. A setting
provided with '--if-exists' overrides all configuration variables provided with '--if-exists' overrides the `trailer.ifExists` and any
applicable `trailer.<token>.ifExists` configuration variables
and applies to all '--trailer' options until the next occurrence of and applies to all '--trailer' options until the next occurrence of
'--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the '--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the
effect of any previous use of '--if-exists, such that the relevant configuration effect of any previous use of '--if-exists, such that the relevant configuration
@ -134,7 +136,8 @@ OPTIONS
--no-if-missing:: --no-if-missing::
Specify what action will be performed when there is no other Specify what action will be performed when there is no other
trailer with the same <token> in the input. A setting trailer with the same <token> in the input. A setting
provided with '--if-missing' overrides all configuration variables provided with '--if-missing' overrides the `trailer.ifMissing` and any
applicable `trailer.<token>.ifMissing` configuration variables
and applies to all '--trailer' options until the next occurrence of and applies to all '--trailer' options until the next occurrence of
'--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing, '--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing,
clear the effect of any previous use of '--if-missing, such that the relevant clear the effect of any previous use of '--if-missing, such that the relevant