Merge branch 'jk/describe-omit-some-refs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 21:57:11 +0000 (13:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 21:57:11 +0000 (13:57 -0800)
"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

1  2 
contrib/completion/git-completion.bash
index 41ee52991d0c1b1fa2a6021133cffecd3ca9deb0,21c2b4315b1ee7df2e53c48529eeddd99955e4c9..a16f33b895a867b96d64257bbb937eb30455f3ef
@@@ -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