diff options
author | Jeff King <peff@peff.net> | 2008-07-31 03:36:09 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-31 11:20:13 -0700 |
commit | fdc7c81111a2ca8d97b8b45e260d7a4e737c8766 (patch) | |
tree | b4b425ff356060a547af878077b4648c382d78b4 /builtin-merge-recursive.c | |
parent | f448e24e2fe336621306b04b84e947bdd04f7ecc (diff) | |
download | git-fdc7c81111a2ca8d97b8b45e260d7a4e737c8766.tar.gz |
Compact commit template message
We recently let the user know explicitly that an empty
commit message will abort the commit. However, this adds yet
another line to the template; let's rephrase and re-wrap so
that this fits back on two lines.
This patch also makes the "fatal: empty commit message?"
warning a bit less scary, since this is now a "feature"
instead of an error. However, we retain the non-zero exit
status to indicate to callers that nothing was committed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions