summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-merge.txt
diff options
context:
space:
mode:
authorLibravatar Adam Monsen <haircut@gmail.com>2012-03-31 12:28:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-01 15:20:38 -0700
commitb0ad5e27803cd599e629b1a64b74ac4bffb3962d (patch)
tree42e4f6b6970c7b8c17dcd65b22edd373503abf21 /Documentation/technical/api-merge.txt
parentcommit: rephrase the error when user did not touch templated log message (diff)
downloadtgif-b0ad5e27803cd599e629b1a64b74ac4bffb3962d.tar.xz
git-commit.txt: clarify -t requires editing message
Make it clear that, when using commit --template, the message *must* be changed or the commit will be aborted. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Ivan Heffner <iheffner@gmail.com> Signed-off-by: Adam Monsen <haircut@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-merge.txt')
0 files changed, 0 insertions, 0 deletions