Merge branch 'sb/parse-options'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index c1adf594972884b77c1f049b35a983688601a343..bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
-             [--output=<file>]
+             [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
 
@@ -51,6 +51,9 @@ OPTIONS
 --output=<file>::
        Write the archive to <file> instead of stdout.
 
+--worktree-attributes::
+       Look for attributes in .gitattributes in working directory too.
+
 <extra>::
        This can be any options that the archiver backend understands.
        See next section.