From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Dec 2017 22:08:50 +0000 (-0800)
Subject: Merge branch 'hi/merge-verify-sig-config'
X-Git-Tag: v2.16.0-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0433d533f1

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
---

0433d533f13671f4313c31e34707f0f5281a18e0