Stefan Beller <sbeller@xxxxxxxxxx> writes:
> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html