Merge branch 'ps/contains-id-error-message'

"git tag --contains no-such-commit" gave a full list of options
after giving an error message.

* ps/contains-id-error-message:
  parse-options: do not show usage upon invalid option value

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/shortlog.c
Simple merge

diff --cc builtin/update-index.c
Simple merge

diff --cc parse-options.c
Simple merge

diff --cc parse-options.h
Simple merge

diff --cc t/t3404-rebase-interactive.sh
Simple merge