From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Oct 2015 22:43:48 +0000 (-0700)
Subject: Merge branch 'tk/doc-interpret-trailers-grammo'
X-Git-Tag: v2.7.0-rc0~99
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b80dd559c99ad8afa2d9ec513b18048257547593?ds=inline;hp=-c

Merge branch 'tk/doc-interpret-trailers-grammo'

* tk/doc-interpret-trailers-grammo:
Documentation/interpret-trailers: Grammar fix
---

b80dd559c99ad8afa2d9ec513b18048257547593
diff --combined Documentation/git-interpret-trailers.txt
index d6d9231b50,29e17676a9..0ecd497c4d
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@@ -3,7 -3,7 +3,7 @@@ git-interpret-trailers(1
  
  NAME
  ----
 -git-interpret-trailers - help add stuctured information into commit messages
 +git-interpret-trailers - help add structured information into commit messages
  
  SYNOPSIS
  --------
@@@ -43,7 -43,7 +43,7 @@@ This means that the trimmed <token> an
  
  By default the new trailer will appear at the end of all the existing
  trailers. If there is no existing trailer, the new trailer will appear
 -after the commit message part of the ouput, and, if there is no line
 +after the commit message part of the output, and, if there is no line
  with only spaces at the end of the commit message part, one blank line
  will be added before the new trailer.
  
@@@ -56,7 -56,7 +56,7 @@@ minus signs start the patch part of th
  
  When reading trailers, there can be whitespaces before and after the
  token, the separator and the value. There can also be whitespaces
 -indide the token and the value.
 +inside the token and the value.
  
  Note that 'trailers' do not follow and are not intended to follow many
  rules for RFC 822 headers. For example they do not follow the line
@@@ -67,7 -67,7 +67,7 @@@ OPTION
  --trim-empty::
  	If the <value> part of any trailer contains only whitespace,
  	the whole trailer will be removed from the resulting message.
- 	This apply to existing trailers as well as new trailers.
+ 	This applies to existing trailers as well as new trailers.
  
  --trailer <token>[(=|:)<value>]::
  	Specify a (<token>, <value>) pair that should be applied as a