Merge branch 'ab/ref-filter-no-contains'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:21:50 +0000 (00:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:21:50 +0000 (00:21 -0700)
"git tag/branch/for-each-ref" family of commands long allowed to
filter the refs by "--contains X" (show only the refs that are
descendants of X), "--merged X" (show only the refs that are
ancestors of X), "--no-merged X" (show only the refs that are not
ancestors of X). One curious omission, "--no-contains X" (show
only the refs that are not descendants of X) has been added to
them.

* ab/ref-filter-no-contains:
tag: add tests for --with and --without
ref-filter: reflow recently changed branch/tag/for-each-ref docs
ref-filter: add --no-contains option to tag/branch/for-each-ref
tag: change --point-at to default to HEAD
tag: implicitly supply --list given another list-like option
tag: change misleading --list <pattern> documentation
parse-options: add OPT_NONEG to the "contains" option
tag: add more incompatibles mode tests
for-each-ref: partly change <object> to <commit> in help
tag tests: fix a typo in a test description
tag: remove a TODO item from the test suite
ref-filter: add test for --contains on a non-commit
ref-filter: make combining --merged & --no-merged an error
tag doc: reword --[no-]merged to talk about commits, not tips
tag doc: split up the --[no-]merged documentation
tag doc: move the description of --[no-]merged earlier

1  2 
Documentation/git-branch.txt
builtin/branch.c
contrib/completion/git-completion.bash
ref-filter.c
t/t3200-branch.sh
t/t7004-tag.sh
Simple merge
Simple merge
Simple merge
diff --cc ref-filter.c
Simple merge
Simple merge
diff --cc t/t7004-tag.sh
Simple merge