From: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
Signed-off-by: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
---
Notes (series):
Demo:
$ html2text <git-interpret-trailers.html | grep "'"
This means that the trimmed <key> and <value> will be separated by ': ' (one
$ git interpret-trailers --trailer 'sign: Alice <alice@xxxxxxxxxxx>' --
trailer 'sign: Bob <bob@xxxxxxxxxxx>' <msg.txt
$ git interpret-trailers --trailer 'Acked-by: Alice <alice@xxxxxxxxxxx>'
$ git interpret-trailers --trailer 'Cc: Alice <alice@xxxxxxxxxxx>' --
trailer 'Reviewed-by: Bob <bob@xxxxxxxxxxx>' 0001-foo.patch >0001-
* Configure a sign trailer with a command to automatically add a 'Signed-
off-by: ' with the author information only if there is no 'Signed-off-by:
' already, and show how it works:
$ git config trailer.sign.cmd 'echo "$(git config user.name) <$(git
config user.email)>"'
$ sed -e 's/ Z$/ /' temp.txt > commit_template.txt
And on ‘master’:
$ html2text <git-interpret-trailers.html |grep "'"
This means that the trimmed <key> and <value> will be separated by ': ' (one
exists. Upon encountering '--no-if-exists, clear the effect of any
previous use of '--if-exists, such that the relevant configuration
missing. Upon encountering '--no-if-missing, clear the effect of any
previous use of '--if-missing, such that the relevant configuration
$ git interpret-trailers --trailer 'sign: Alice <alice@xxxxxxxxxxx>' --
trailer 'sign: Bob <bob@xxxxxxxxxxx>' <msg.txt
$ git interpret-trailers --trailer 'Acked-by: Alice <alice@xxxxxxxxxxx>'
$ git interpret-trailers --trailer 'Cc: Alice <alice@xxxxxxxxxxx>' --
trailer 'Reviewed-by: Bob <bob@xxxxxxxxxxx>' 0001-foo.patch >0001-
* Configure a sign trailer with a command to automatically add a 'Signed-
off-by: ' with the author information only if there is no 'Signed-off-by:
' already, and show how it works:
$ git config trailer.sign.cmd 'echo "$(git config user.name) <$(git
config user.email)>"'
$ sed -e 's/ Z$/ /' temp.txt > commit_template.txt
Documentation/git-interpret-trailers.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-interpret-trailers.adoc b/Documentation/git-interpret-trailers.adoc
index 82c8780d932..fd335fe772a 100644
--- a/Documentation/git-interpret-trailers.adoc
+++ b/Documentation/git-interpret-trailers.adoc
@@ -142,8 +142,8 @@ OPTIONS
provided with '--if-exists' overrides the `trailer.ifExists` and any
applicable `trailer.<keyAlias>.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
+ '--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
variables are no longer overridden. Possible actions are `addIfDifferent`,
`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
@@ -154,8 +154,8 @@ OPTIONS
provided with '--if-missing' overrides the `trailer.ifMissing` and any
applicable `trailer.<keyAlias>.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
+ '--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
configuration variables are no longer overridden. Possible actions are `doNothing`
or `add`.
base-commit: 954d33a9757fcfab723a824116902f1eb16e05f7
--
2.50.1
