Merge branch 'tf/diff-whitespace-incomplete-line' into maint

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852..92444ddf10081ee5faccd28491b47ef1cb45deee 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
 SYNOPSIS
 --------
 [verse]
-'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
              [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]