Merge branch 'maint'

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index c66c82c61dfcde03ecac67371939a93a3180b54c..296937a4167dc2e4c93cfcafca9fea14090cb108 100644 (file)
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -9,7 +9,7 @@ git-quiltimport - Applies a quilt patchset onto the current branch
 SYNOPSIS
 --------
 [verse]
-'git-quiltimport' [--author <author>] [--patches <dir>]
+'git-quiltimport' [--dry-run] [--author <author>] [--patches <dir>]
 
 
 DESCRIPTION
@@ -29,6 +29,12 @@ preserved as the 1 line subject in the git description.
 
 OPTIONS
 -------
+--dry-run::
+       Walk through the patches in the series and warn
+       if we cannot find all of the necessary information to commit
+       a patch.  At the time of this writing only missing author
+       information is warned about.
+
 --author Author Name <Author Email>::
        The author name and email address to use when no author
        information can be found in the patch description.
@@ -36,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
 ------