diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:19 (GMT) |
| commit | ae4e3f4ae280d71eda15cee9a42a021f7360bd7e (patch) | |
| tree | 53fec18e1c084bc2853436096bb4f12fb46875ad /Documentation/git-interpret-trailers.txt | |
| parent | 5a6693089f599546adc2559d0117b91767b1f10c (diff) | |
| parent | 1e83b9bfdddd726ad86f1357ae1dc2ee03f4a46f (diff) | |
| download | git-ae4e3f4ae280d71eda15cee9a42a021f7360bd7e.zip git-ae4e3f4ae280d71eda15cee9a42a021f7360bd7e.tar.gz git-ae4e3f4ae280d71eda15cee9a42a021f7360bd7e.tar.bz2 | |
Merge branch 'sb/trailers-docfix'
Doc update.
* sb/trailers-docfix:
Documentation/git-interpret-trailers: explain possible values
Diffstat (limited to 'Documentation/git-interpret-trailers.txt')
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 9111c47..b8fafb1 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -88,7 +88,8 @@ OPTIONS 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'. + '--where' or '--no-where'. Possible values are `after`, `before`, + `end` or `start`. --if-exists <action>:: --no-if-exists:: @@ -96,7 +97,8 @@ OPTIONS 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-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`, + `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`. --if-missing <action>:: --no-if-missing:: @@ -104,7 +106,8 @@ OPTIONS 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'. + '--if-missing' or '--no-if-missing'. Possible actions are `doNothing` + or `add`. --only-trailers:: Output only the trailers, not any other parts of the input. |