projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc4a226 fb2afea)
Merge branch 'hi/merge-verify-sig-config'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000 (14:08 -0800)
commit0433d533f13671f4313c31e34707f0f5281a18e0
tree0b6e055b35fe853705118d32481d9c7602b3b331tree | snapshot
parentfc4a226bf60be67bc3d574aeafe06d266f700d99commit | diff
parentfb2afea366044fc2b4fff9929a06a1ca36f506dfcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.