diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-23 21:39:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 21:39:51 (GMT) |
| commit | 577bff3a81079ebaf278eb98e10453f65678c135 (patch) | |
| tree | bbe1b3145d33b4b282ddef7445646812d226e373 /Documentation | |
| parent | 8a40af9cabe2efbb830bf90c864ffda3136926ba (diff) | |
| parent | 47cfc9bd7d0add617cf6d928e96b7d207be614f1 (diff) | |
| download | git-577bff3a81079ebaf278eb98e10453f65678c135.zip git-577bff3a81079ebaf278eb98e10453f65678c135.tar.gz git-577bff3a81079ebaf278eb98e10453f65678c135.tar.bz2 | |
Merge branch 'kn/attr-from-tree'
"git check-attr" learned to take an optional tree-ish to read the
.gitattributes file from.
* kn/attr-from-tree:
attr: add flag `--source` to work with tree-ish
t0003: move setup for `--all` into new block
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-check-attr.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index 84f41a8..6e4f3aa 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -9,8 +9,8 @@ git-check-attr - Display gitattributes information SYNOPSIS -------- [verse] -'git check-attr' [-a | --all | <attr>...] [--] <pathname>... -'git check-attr' --stdin [-z] [-a | --all | <attr>...] +'git check-attr' [--source <tree-ish>] [-a | --all | <attr>...] [--] <pathname>... +'git check-attr' --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...] DESCRIPTION ----------- @@ -36,6 +36,11 @@ OPTIONS If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. +--source=<tree-ish>:: + Check attributes against the specified tree-ish. It is common to + specify the source tree by naming a commit, branch or tag associated + with it. + \--:: Interpret all preceding arguments as attributes and all following arguments as path names. |