summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-24 14:05:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-24 14:05:23 -0700
commit9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32 (patch)
tree484bd6aff615aeeb2c6b8de5e1e8d84fe0668563
parentMerge branch 'jk/maint-commit-check-committer-early' (diff)
parentcommit: document the temporary commit message file (diff)
downloadtgif-9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32.tar.xz
Merge branch 'jk/maint-commit-document-editmsg'
Document $GIT_DIR/COMMIT_EDITMSG file. * jk/maint-commit-document-editmsg: commit: document the temporary commit message file
-rw-r--r--Documentation/git-commit.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index f400835921..4622297ec9 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -407,6 +407,15 @@ This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,
and `post-commit` hooks. See linkgit:githooks[5] for more
information.
+FILES
+-----
+
+`$GIT_DIR/COMMIT_EDITMSG`::
+ This file contains the commit message of a commit in progress.
+ If `git commit` exits due to an error before creating a commit,
+ any commit message that has been provided by the user (e.g., in
+ an editor session) will be available in this file, but will be
+ overwritten by the next invocation of `git commit`.
SEE ALSO
--------