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

* tk/doc-interpret-trailers-grammo:
  Documentation/interpret-trailers: Grammar fix
This commit is contained in:
Junio C Hamano 2015-10-16 14:32:56 -07:00
commit 0dd9e571e8

View file

@ -67,7 +67,7 @@ OPTIONS
--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