From: René Scharfe Date: Wed, 10 Feb 2010 19:07:40 GMT Subject: Re: [PATCH] git-archive documentation: .gitattributes must be committed Message-ID: <4B7303FC.6070701@lsrfire.ath.cx> In-Reply-To: <1265770284-14830-1-git-send-email-fmarier@gmail.com> Am 10.02.2010 03:51, schrieb Francois Marier: > Add a note to the documentation stating that the .gitattributes > file must be present (i.e. committed) in the named tree that is > exported. > > This can be a bit confusing because it's different from .gitignore > which takes effect as soon as the file is created. > > Signed-off-by: Francois Marier > --- > Documentation/git-archive.txt | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt > index 799c8b6..fcd681d 100644 > --- a/Documentation/git-archive.txt > +++ b/Documentation/git-archive.txt > @@ -112,6 +112,9 @@ export-subst:: > expand several placeholders when adding this file to an archive. > See linkgit:gitattributes[5] for details. > > +The .gitattributes file must be present in the named tree for it to take > +effect. Uncommitted attributes will not be considered in exports. > + > EXAMPLES > -------- > git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -):: Yeah, the description of --worktree-attributes is a bit terse. The lines you add make it appear almost as if this switch doesn't exist, though; perhaps add a "unless --worktree-attributes is given" or similar to one of the new sentences? René