Merge branch 'ls/travis-coccicheck'

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index f7a069bb9234850568d0870fa92ef25d0e1a19b5..c890328b02ec4c3a28aaeb8aa057d327c75b9967 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -557,7 +557,7 @@ series A, B, C, the history would be like:
 ................................................
 
 With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
-`--cover-letter` of using `Z..C` instead of `-3 C` to specify the
+`--cover-letter` or using `Z..C` instead of `-3 C` to specify the
 range), the base tree information block is shown at the end of the
 first message the command outputs (either the first patch, or the
 cover letter), like this: