summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-30 12:14:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-30 12:20:00 -0700
commitb2eda9bdfbacdd3bb52da2ebcb468415cf153940 (patch)
tree4c2c39f109910aa25121fa11d4e4e68ead4da84d /Documentation/technical/api-merge.txt
parentcommit: do not trigger bogus "has templated message edited" check (diff)
downloadtgif-b2eda9bdfbacdd3bb52da2ebcb468415cf153940.tar.xz
commit: rephrase the error when user did not touch templated log message
When the user exited editor without editing the commit log template given by "git commit -t <template>", the commit was aborted (correct) with an error message that said "due to empty commit message" (incorrect). This was because the original template support was done by piggybacking on the check to detect an empty log message. Split the codepaths into two independent checks to clarify the error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-merge.txt')
0 files changed, 0 insertions, 0 deletions