tree 0b6e055b35fe853705118d32481d9c7602b3b331
parent fc4a226bf60be67bc3d574aeafe06d266f700d99
parent fb2afea366044fc2b4fff9929a06a1ca36f506df
author Junio C Hamano <gitster@pobox.com> 1514498930 -0800
committer Junio C Hamano <gitster@pobox.com> 1514498930 -0800

Merge branch 'hi/merge-verify-sig-config'

"git merge" learned to pay attention to merge.verifySignatures
configuration variable and pretend as if '--verify-signatures'
option was given from the command line.

* hi/merge-verify-sig-config:
  t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
  t: add tests for pull --verify-signatures
  merge: add config option for verifySignatures