Merge git://repo.or.cz/git-gui

diff --git a/builtin-commit.c b/builtin-commit.c
index 9a11ca0bcd402d9bd4488df6e3526e4a24617b30..f7c053a0106c2e42833d0d7c7255b7b636d09a93 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -555,6 +555,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
                fprintf(fp,
                        "\n"
                        "# Please enter the commit message for your changes.\n"
+                       "# To abort the commit, use an empty commit message.\n"
                        "# (Comment lines starting with '#' will ");
                if (cleanup_mode == CLEANUP_ALL)
                        fprintf(fp, "not be included)\n");