From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:43:07 +0000 (-0700)
Subject: Merge branch 'jc/commit-unedited-template'
X-Git-Tag: v1.7.11-rc0~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=091df17f27ed735160bbd82360efb8154b35ffeb;p=git.git

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

091df17f27ed735160bbd82360efb8154b35ffeb