summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:00 -0700
commit73bc4b4928e0111aa97c9963535223abb6fb2545 (patch)
treef6178690acea2486b67b59c2c625a1a3ff0f0c33 /merge-blobs.c
parentMerge branch 'ew/fast-import-unpack-limit' (diff)
parentpull: warn on --verify-signatures with --rebase (diff)
downloadtgif-73bc4b4928e0111aa97c9963535223abb6fb2545.tar.xz
Merge branch 'ah/no-verify-signature-with-pull-rebase'
"git pull --rebase --verify-signature" learned to warn the user that "--verify-signature" is a no-op when rebasing. * ah/no-verify-signature-with-pull-rebase: pull: warn on --verify-signatures with --rebase
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions