| commit | b4bd6bb356795ef817d44d65c16bba7f192ab29e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:15 +0000 (26 10:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:15 +0000 (26 10:35 -0700) | ||
| tree | fa810822ac0ebc8d83178a888f7340acbb6e04dc | treesnapshot (tar.gz zip) |
| parent | 4579a0547cc558bd0e341adb77897e1f2f331f78 | commitdiff |
| parent | 1f08c2c8258cb09d4e78b8c3ff7e45a570f957ea | commitdiff |
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
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
| builtin/commit.c | diff1 | diff2 | blobhistory |