summaryrefslogtreecommitdiff
path: root/Documentation/git-describe.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 20:46:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-25 20:46:42 (GMT)
commitf7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch)
tree3d37b13993699ccd8f1bebc1b4b93546da3e9bda /Documentation/git-describe.txt
parent04fe1184fd0611bf26785b365dd344b8f7d72861 (diff)
parent7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (diff)
downloadgit-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.zip
git-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.gz
git-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.bz2
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1: bundle: Add colons to list headings in "verify" bundle: Fix "verify" output if history is complete Documentation: filter-branch env-filter example git-filter-branch.txt: clarify ident variables usage git-compat-util.h: Provide missing netdb.h definitions describe: Document --match pattern format Documentation/githooks: Explain pre-rebase parameters update-index: list supported idx versions and their features diff-options: unconfuse description of --color read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() index-format.txt: mention of v4 is missing in some places
Diffstat (limited to 'Documentation/git-describe.txt')
-rw-r--r--Documentation/git-describe.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 32da244..3c81e85 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -81,8 +81,9 @@ OPTIONS
that points at object deadbee....).
--match <pattern>::
- Only consider tags matching the given pattern (can be used to avoid
- leaking private tags made from the repository).
+ Only consider tags matching the given `glob(7)` pattern,
+ excluding the "refs/tags/" prefix. This can be used to avoid
+ leaking private tags from the repository.
--always::
Show uniquely abbreviated commit object as fallback.