summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-18 11:45:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-18 11:45:03 -0800
commit74f45dfd78661a84fcff81e616ef6c154deadcb9 (patch)
tree1fc3f1b6a92593b26bbd6639fd4be236adc83cfa /git-merge-resolve.sh
parentMerge branch 'jk/decimal-width-for-uintmax' (diff)
parenttransport-helper: fix typo in error message when --signed is not supported (diff)
downloadtgif-74f45dfd78661a84fcff81e616ef6c154deadcb9.tar.xz
Merge branch 'jc/push-cert'
"git push --signed" gave an incorrectly worded error message when the other side did not support the capability. * jc/push-cert: transport-helper: fix typo in error message when --signed is not supported
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions