summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-files.txt
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2016-03-01 18:04:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-01 10:16:46 -0800
commitaed7480ca4c284089a3b332fae770b4056eb08fc (patch)
tree0c19112aae623a2ba9d47b2bb8934ce1f32b6676 /Documentation/git-diff-files.txt
parentlockfile: mark strings for translation (diff)
downloadtgif-aed7480ca4c284089a3b332fae770b4056eb08fc.tar.xz
lockfile: improve error message when lockfile exists
A common mistake leading a user to see this message is to launch "git commit", let the editor open (and forget about it), and try again to commit. The previous message was going too quickly to "a git process crashed" and to the advice "remove the file manually". This patch modifies the message in two ways: first, it considers that "another process is running" is the norm, not the exception, and it explicitly hints the user to look at text editors. The message is 2 lines longer, but this is not a problem since experienced users do not see the message often. Helped-by: Moritz Neeb <lists@moritzneeb.de> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-files.txt')
0 files changed, 0 insertions, 0 deletions