Re: [PATCH 4/4] pathspec: record labels

From: Junio C Hamano <gitster@pobox.com>
Date: May 13, 2016, 04:32 UTC
Message-ID: <xmqqfutmbmsv.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160513001936.7623-5-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 16 quoted lines

> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 8ad29e6..a1fc9e0 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -362,6 +362,11 @@ glob;;
>  	For example, "Documentation/{asterisk}.html" matches
>  	"Documentation/git.html" but not "Documentation/ppc/ppc.html"
>  	or "tools/perf/Documentation/perf.html".
> +
> +label:<white space separated list>;;
> +	Labels can be assigned to pathspecs in the .gitattributes file.
> +	By specifying a list of labels the pattern will match only
> +	files which have all of the listed labels.
>  +
>  Two consecutive asterisks ("`**`") in patterns matched against
>  full pathname may have special meaning:

I think the new text is stuffed in the middle of the "glob;;" entry.