diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 91a4dbc9a7..72f5bdb652 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -112,7 +112,8 @@ OPTIONS --where :: --no-where:: 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..where` configuration variables and applies to all '--trailer' options until the next occurrence of '--where' or '--no-where'. Upon encountering '--no-where', clear the effect of any previous use of '--where', such that the relevant configuration @@ -123,7 +124,8 @@ OPTIONS --no-if-exists:: Specify what action will be performed when there is already at least one trailer with the same 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..ifExists` configuration variables and applies to all '--trailer' options until the next occurrence of '--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 @@ -134,7 +136,8 @@ OPTIONS --no-if-missing:: Specify what action will be performed when there is no other trailer with the same 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..ifMissing` configuration variables and applies to all '--trailer' options until the next occurrence of '--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