Merge branch 'ah/no-verify-signature-with-pull-rebase'
commit73bc4b4928e0111aa97c9963535223abb6fb2545
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:00 +0000 (20 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:00 +0000 (20 11:01 -0700)
treef6178690acea2486b67b59c2c625a1a3ff0f0c33
parent8d6a7e9a198488a1594cd178240fb56085129c78
parentc57e501c51d6b76ce30658b94ee4a5dc6ac27f3e
Merge branch 'ah/no-verify-signature-with-pull-rebase'

"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