From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:11 +0000 (-0800)
Subject: Merge branch 'jk/describe-omit-some-refs'
X-Git-Tag: v2.13.0-rc0~179
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1b324988ac0fe14d069991736962289a35f15aec

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
---

1b324988ac0fe14d069991736962289a35f15aec
diff --cc contrib/completion/git-completion.bash
index 41ee52991d,21c2b4315b..a16f33b895
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1206,7 -1197,8 +1206,8 @@@ _git_describe (
  	--*)
  		__gitcomp "
  			--all --tags --contains --abbrev= --candidates=
 -			--exact-match --debug --long --match --always
 +			--exact-match --debug --long --match --always --first-parent
+ 			--exclude
  			"
  		return
  	esac