Merge branch 'maint'

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 296937a4167dc2e4c93cfcafca9fea14090cb108..579e8d2f3ba54e393a60a8b4d8a4ad6a95cb79f1 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' [--dry-run] [--author <author>] [--patches <dir>]
+'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
 
 
 DESCRIPTION
@@ -29,6 +29,8 @@ preserved as the 1 line subject in the git description.
 
 OPTIONS
 -------
+
+-n::
 --dry-run::
        Walk through the patches in the series and warn
        if we cannot find all of the necessary information to commit
@@ -57,5 +59,4 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite