summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 21:32:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-16 21:32:56 (GMT)
commit0dd9e571e837d0f3567af7cb83f92034b4a18ee3 (patch)
treea81fe85cb1dbf1bc99d05c528da9a4206316c50f
parent9ab74762cdb32d17fcb811e8721b706ed5c0570b (diff)
parenta43eb67e653ccaa9a00ff52adb706201d7b1af13 (diff)
downloadgit-0dd9e571e837d0f3567af7cb83f92034b4a18ee3.zip
git-0dd9e571e837d0f3567af7cb83f92034b4a18ee3.tar.gz
git-0dd9e571e837d0f3567af7cb83f92034b4a18ee3.tar.bz2
Merge branch 'tk/doc-interpret-trailers-grammo' into maint
* tk/doc-interpret-trailers-grammo: Documentation/interpret-trailers: Grammar fix
-rw-r--r--Documentation/git-interpret-trailers.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index d6d9231..0ecd497 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -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