From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:35:15 +0000 (-0700)
Subject: Merge branch 'jc/commit-unedited-template' into maint
X-Git-Tag: v1.7.10.1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b4bd6bb356795ef817d44d65c16bba7f192ab29e

Merge branch 'jc/commit-unedited-template' into maint

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
---

b4bd6bb356795ef817d44d65c16bba7f192ab29e