summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-28 22:08:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-28 22:08:50 (GMT)
commit0433d533f13671f4313c31e34707f0f5281a18e0 (patch)
tree0b6e055b35fe853705118d32481d9c7602b3b331 /builtin/describe.c
parentfc4a226bf60be67bc3d574aeafe06d266f700d99 (diff)
parentfb2afea366044fc2b4fff9929a06a1ca36f506df (diff)
downloadgit-0433d533f13671f4313c31e34707f0f5281a18e0.zip
git-0433d533f13671f4313c31e34707f0f5281a18e0.tar.gz
git-0433d533f13671f4313c31e34707f0f5281a18e0.tar.bz2
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
Diffstat (limited to 'builtin/describe.c')
0 files changed, 0 insertions, 0 deletions