diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:04 -0700 |
| commit | bfd91b41341cb922aa1ba6e7c01ccd5ebb81cf41 (patch) | |
| tree | 8309adc9af63683b18c6c30c8ee4a4d74fc567dc /Documentation | |
| parent | 0b9635847944f97079fc6c2283063cd3a0ed0271 (diff) | |
| parent | c88bf5436d84762a474048a0a57409a8f2fa2c6b (diff) | |
| download | git-bfd91b41341cb922aa1ba6e7c01ccd5ebb81cf41.tar.gz git-bfd91b41341cb922aa1ba6e7c01ccd5ebb81cf41.tar.xz | |
Merge branch 'pb/trailers-from-command-line'
"git interpret-trailers" learned to take the trailer specifications
from the command line that overrides the configured values.
* pb/trailers-from-command-line:
interpret-trailers: fix documentation typo
interpret-trailers: add options for actions
trailers: introduce struct new_trailer_item
trailers: export action enums and corresponding lookup functions
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 31cdeaecd..0ef93204f 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -80,6 +80,29 @@ OPTIONS trailer to the input messages. See the description of this command. +--where <placement>:: +--no-where:: + Specify where all new trailers will be added. A setting + provided with '--where' overrides all configuration variables + and applies to all '--trailer' options until the next occurrence of + '--where' or '--no-where'. + +--if-exists <action>:: +--no-if-exists:: + Specify what action will be performed when there is already at + least one trailer with the same <token> in the message. A setting + provided with '--if-exists' overrides all configuration variables + and applies to all '--trailer' options until the next occurrence of + '--if-exists' or '--no-if-exists'. + +--if-missing <action>:: +--no-if-missing:: + Specify what action will be performed when there is no other + trailer with the same <token> in the message. A setting + provided with '--if-missing' overrides all configuration variables + and applies to all '--trailer' options until the next occurrence of + '--if-missing' or '--no-if-missing'. + CONFIGURATION VARIABLES ----------------------- @@ -170,8 +193,8 @@ trailer.<token>.where:: configuration variable and it overrides what is specified by that option for trailers with the specified <token>. -trailer.<token>.ifexist:: - This option takes the same values as the 'trailer.ifexist' +trailer.<token>.ifexists:: + This option takes the same values as the 'trailer.ifexists' configuration variable and it overrides what is specified by that option for trailers with the specified <token>. |