summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-16 12:43:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-16 12:43:07 -0700
commit091df17f27ed735160bbd82360efb8154b35ffeb (patch)
tree497296ce56e74c321d7076e5c9dedfae38aa1ac5 /git-mergetool.sh
parentMerge branch 'bw/spawn-via-shell-path' (diff)
parentDocumentation/git-commit: rephrase the "initial-ness" of templates (diff)
downloadtgif-091df17f27ed735160bbd82360efb8154b35ffeb.tar.xz
Merge branch 'jc/commit-unedited-template'
When "git commit --template F" errors out because the user did not touch the message, it claimed that it aborts due to "empty message", which was utterly wrong. By Junio C Hamano (4) and Adam Monsen (1) * jc/commit-unedited-template: Documentation/git-commit: rephrase the "initial-ness" of templates git-commit.txt: clarify -t requires editing message commit: rephrase the error when user did not touch templated log message commit: do not trigger bogus "has templated message edited" check t7501: test the right kind of breakage
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions