aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2013-04-10 19:49:57 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-11 17:38:45 -0700
commit59a7714c8909f1a925a7faa4f3015f015c087ee5 (patch)
tree43ec741af3b0abf89917766d162eb8b1d1d81ddc
parent13cb3bb7e6e69fbd82db460f1d23ccb2111e8b63 (diff)
downloadgit-59a7714c8909f1a925a7faa4f3015f015c087ee5.tar.gz
git-59a7714c8909f1a925a7faa4f3015f015c087ee5.tar.xz
archive: clarify explanation of --worktree-attributes
Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PWD). Link to the ATTRIBUTES section, which has more details. Reported-by: Amit Bakshi <ambakshi@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-archive.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index b4c2e2484..250e5228a 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -56,7 +56,8 @@ OPTIONS
Write the archive to <file> instead of stdout.
--worktree-attributes::
- Look for attributes in .gitattributes in working directory too.
+ Look for attributes in .gitattributes files in the working tree
+ as well (see <<ATTRIBUTES>>).
<extra>::
This can be any options that the archiver backend understands.
@@ -120,6 +121,7 @@ tar.<format>.remote::
user-defined formats, but true for the "tar.gz" and "tgz"
formats.
+[[ATTRIBUTES]]
ATTRIBUTES
----------