Merge branch 'bc/maint-am-email'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index ad38f7f39db8d3b973f0ede255f65bb0627bb416..bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+             [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
 
@@ -47,6 +48,12 @@ OPTIONS
 --prefix=<prefix>/::
        Prepend <prefix>/ to each filename in the archive.
 
+--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.