summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-07-10 13:59:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-10 13:59:07 -0700
commit5a24b4e14a7120879213aad9a13b1914e5756820 (patch)
tree88d206f758fcbf18040e0129c94866a595138bfc /merge-blobs.c
parentMerge branch 'ab/sha1dc-maint' into maint (diff)
parentt5534: fix misleading grep invocation (diff)
downloadtgif-5a24b4e14a7120879213aad9a13b1914e5756820.tar.xz
Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint
A few tests that tried to verify the contents of push certificates did not use 'git rev-parse' to formulate the line to look for in the certificate correctly. * js/t5534-rev-parse-gives-multi-line-output-fix: t5534: fix misleading grep invocation
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions