diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:15 -0700 |
commit | b4bd6bb356795ef817d44d65c16bba7f192ab29e (patch) | |
tree | fa810822ac0ebc8d83178a888f7340acbb6e04dc /builtin/index-pack.c | |
parent | Merge branch 'jk/add-p-skip-conflicts' into maint (diff) | |
parent | Documentation/git-commit: rephrase the "initial-ness" of templates (diff) | |
download | tgif-b4bd6bb356795ef817d44d65c16bba7f192ab29e.tar.xz |
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
Diffstat (limited to 'builtin/index-pack.c')
0 files changed, 0 insertions, 0 deletions