From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:19 +0000 (-0700)
Subject: Merge branch 'sb/trailers-docfix'
X-Git-Tag: v2.19.0-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae4e3f4ae280d71eda15cee9a42a021f7360bd7e?hp=-c

Merge branch 'sb/trailers-docfix'

Doc update.

* sb/trailers-docfix:
Documentation/git-interpret-trailers: explain possible values
---

ae4e3f4ae280d71eda15cee9a42a021f7360bd7e
diff --combined Documentation/git-interpret-trailers.txt
index 9111c47a1b,ce6ff1303a..b8fafb1e8b
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@@ -8,8 -8,8 +8,8 @@@ git-interpret-trailers - add or parse s
  SYNOPSIS
  --------
  [verse]
 -'git interpret-trailers' [options] [(--trailer <token>[(=|:)<value>])...] [<file>...]
 -'git interpret-trailers' [options] [--parse] [<file>...]
 +'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]
 +'git interpret-trailers' [<options>] [--parse] [<file>...]
  
  DESCRIPTION
  -----------
@@@ -88,7 -88,8 +88,8 @@@ OPTION
  	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 +97,8 @@@
  	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 +106,8 @@@
  	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.