From: Junio C Hamano Date: Tue, 22 Aug 2017 17:36:57 +0000 (-0700) Subject: Merge branch 'jk/trailers-parse' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d4d937141feaab5e743be3b7ed2998c9b98f49e?hp=6490525c54d65b2e66ecdcf64a2f25c2602040e1 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 --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 30386e887b..9dd19a1dd9 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -21,7 +21,7 @@ This command reads some patches or commit messages from either the arguments or the standard input if no 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.