git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Francois Marier <fmarier@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-archive documentation: .gitattributes must be committed
Date: Wed, 10 Feb 2010 20:07:40 +0100	[thread overview]
Message-ID: <4B7303FC.6070701@lsrfire.ath.cx> (raw)
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 <fmarier@gmail.com>
> ---
>  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é

  reply	other threads:[~2010-02-10 19:07 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-10  2:51 [PATCH] git-archive documentation: .gitattributes must be committed Francois Marier
2010-02-10 19:07 ` René Scharfe [this message]
2010-02-10 19:27   ` Junio C Hamano
2010-02-10 19:33     ` Junio C Hamano
2010-02-10 20:00     ` René Scharfe
2010-02-10 20:18       ` Junio C Hamano
2010-02-10 20:33         ` Junio C Hamano
2010-02-11  3:48           ` Francois Marier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B7303FC.6070701@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=fmarier@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).