summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:28 -0700
commit3de9da8e2cf34f6e6589a5001b751a18ec780e36 (patch)
tree7580902dd07348cce77bdffab14f25c20185a294 /git-merge-one-file.sh
parentMerge branch 'mh/credential-leakfix' into maint (diff)
parentt6300: check for cat-file exit status code (diff)
downloadtgif-3de9da8e2cf34f6e6589a5001b751a18ec780e36.tar.xz
Merge branch 'dd/t6300-wo-gpg-fix' into maint
Test fix. * dd/t6300-wo-gpg-fix: t6300: check for cat-file exit status code t6300: don't run cat-file on non-existent object
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions