summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-25 15:40:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-25 15:40:19 -0800
commit33a2eeaeade52afee9fb9ffdd2ae995acf3b7e4e (patch)
treec46721ce09684b2466098d67c97c9781769f1b5e /builtin/merge-tree.c
parentMerge branch 'jk/sanity' (diff)
parentsend-email: ask confirmation if given encoding name is very short (diff)
downloadtgif-33a2eeaeade52afee9fb9ffdd2ae995acf3b7e4e.tar.xz
Merge branch 'jc/send-email-sensible-encoding'
"git send-email" used to accept a mistaken "y" (or "yes") as an answer to "What encoding do you want to use [UTF-8]? " without questioning. Now it asks for confirmation when the answer looks too short to be a valid encoding name. * jc/send-email-sensible-encoding: send-email: ask confirmation if given encoding name is very short
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions