Merge branch 'jc/error-message-in-cherry-pick'

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 6e9a8c369a38e85c003c451b414fd58c24445aba..0fc2b56c12b0ca97b8868f27d2f4ac149ead04d6 100644 (file)
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -42,10 +42,10 @@ OPTIONS
 --patches <dir>::
        The directory to find the quilt patches and the
        quilt series file.
-
-        The default for the patch directory is patches
-       or the value of the $QUILT_PATCHES environment
-       variable.
++
+The default for the patch directory is patches
+or the value of the $QUILT_PATCHES environment
+variable.
 
 Author
 ------
@@ -57,5 +57,4 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite