Merge branch 'fk/maint-cvsimport-early-failure' into maint

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index a00b783fe5dd7a074fc70f9aed85e6e45189ac8f..9dcafc6d4442b6db66df642e92336537395b9919 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -74,7 +74,7 @@ OPTIONS
 include::diff-options.txt[]
 
 -<n>::
-       Limits the number of patches to prepare.
+       Prepare patches from the topmost <n> commits.
 
 -o <dir>::
 --output-directory <dir>::