Merge branch 'jk/merge-one-file-working-tree' into maint

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 0fc2b56c12b0ca97b8868f27d2f4ac149ead04d6..7f112f3dcd87490dcf50fc74e45cace5736c599f 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
@@ -47,14 +49,6 @@ The default for the patch directory is patches
 or the value of the $QUILT_PATCHES environment
 variable.
 
-Author
-------
-Written by Eric Biederman <ebiederm@lnxi.com>
-
-Documentation
---------------
-Documentation by Eric Biederman <ebiederm@lnxi.com>
-
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite