Merge branch 'jk/trailers-parse' into next

"git interpret-trailers" has been taught a "--parse" and a few
other options to make it easier for scripts to grab existing
trailer lines from a commit log message.

* jk/trailers-parse:
doc/interpret-trailers: fix "the this" typo

diff --combined Documentation/git-interpret-trailers.txt
index 30386e887b3681df435fd980c69ca10b51d082a3,2e22210734ffadb05ce33f446f7bb07d0fc7be5a..9dd19a1dd9f126fbf54f1dc628b30fbe05445cf3
--- 1/Documentation/git-interpret-trailers.txt
--- 2/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@@ -21,7 -21,7 +21,7 @@@ This command reads some patches or comm
  <file> arguments or the standard input if no <file> is specified. If
  `--parse` is specified, the output consists of the parsed trailers.
  
- Otherwise, the this command applies the arguments passed using the
+ Otherwise, this command applies the arguments passed using the
  `--trailer` option, if any, to the commit message part of each input
  file. The result is emitted on the standard output.
  
@@@ -83,29 -83,6 +83,29 @@@ OPTION
        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'.
 +
  --only-trailers::
        Output only the trailers, not any other parts of the input.
  
@@@ -212,8 -189,8 +212,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>.