Merge branch 'ah/no-verify-signature-with-pull-rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:00 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:00 +0000 (11:01 -0700)
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.

* ah/no-verify-signature-with-pull-rebase:
pull: warn on --verify-signatures with --rebase

Trivial merge