Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-interpret-trailers: explain possible values
author
Stefan Beller
<sbeller@google.com>
Fri, 20 Jul 2018 21:53:49 +0000
(14:53 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 20 Jul 2018 22:23:59 +0000
(15:23 -0700)
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-interpret-trailers.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
fc54c1a
)
diff --git
a/Documentation/git-interpret-trailers.txt
b/Documentation/git-interpret-trailers.txt
index ff446f15f79f270a8979d1a398450a50ba4a4e95..ce6ff1303ae9ba5ffad6ceab1f5836903ce233c3 100644
(file)
--- 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
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::
--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
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::
--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
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.
--only-trailers::
Output only the trailers, not any other parts of the input.