summaryrefslogtreecommitdiff
path: root/Documentation/git-archive.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-10 18:39:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-10 18:39:28 (GMT)
commit54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156 (patch)
treef7f05586cc347037edfb8ee7decf551fb2fc8b9e /Documentation/git-archive.txt
parentb393515f8ef43d5e873502dd80205233933389a1 (diff)
parent7a876edf5d5224e0755cfabb808b042f300e293d (diff)
downloadgit-54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156.zip
git-54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156.tar.gz
git-54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156.tar.bz2
Merge branch 'maint-1.7.2' into maint
* maint-1.7.2: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
Diffstat (limited to 'Documentation/git-archive.txt')
-rw-r--r--Documentation/git-archive.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 4163a1b..bf5037a 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -116,7 +116,7 @@ Note that attributes are by default taken from the `.gitattributes` files
in the tree that is being archived. If you want to tweak the way the
output is generated after the fact (e.g. you committed without adding an
appropriate export-ignore in its `.gitattributes`), adjust the checked out
-`.gitattributes` file as necessary and use `--work-tree-attributes`
+`.gitattributes` file as necessary and use `--worktree-attributes`
option. Alternatively you can keep necessary attributes that should apply
while archiving any tree in your `$GIT_DIR/info/attributes` file.