Merge branch 'jc/branch-contains'

* jc/branch-contains:
git-branch --contains: doc and test
git-branch --contains=commit
parse-options: Allow to hide options from the default usage.

diff --cc Documentation/git-branch.txt
Simple merge