summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:11 (GMT)
commit1b324988ac0fe14d069991736962289a35f15aec (patch)
treec2cfb5556541cd671699cade50a8dbb23174c19d /contrib
parente7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 (diff)
parent77d21f29eaddb1fbe82e013ea42d4e0180bbdda2 (diff)
downloadgit-1b324988ac0fe14d069991736962289a35f15aec.zip
git-1b324988ac0fe14d069991736962289a35f15aec.tar.gz
git-1b324988ac0fe14d069991736962289a35f15aec.tar.bz2
Merge branch 'jk/describe-omit-some-refs'
"git describe" and "git name-rev" have been taught to take more than one refname patterns to restrict the set of refs to base their naming output on, and also learned to take negative patterns to name refs not to be used for naming via their "--exclude" option. * jk/describe-omit-some-refs: describe: teach describe negative pattern matches describe: teach --match to accept multiple patterns name-rev: add support to exclude refs by pattern match name-rev: extend --refs to accept multiple patterns doc: add documentation for OPT_STRING_LIST
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 41ee529..a16f33b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1207,6 +1207,7 @@ _git_describe ()
__gitcomp "
--all --tags --contains --abbrev= --candidates=
--exact-match --debug --long --match --always --first-parent
+ --exclude
"
return
esac