summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:05:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:05:36 -0700
commitf17adbce64efe49dcbdd3b7d14dc8b3621b5e193 (patch)
treeacc4f92f0ba7a528ec0ba0afba3f5558921d4a6e /Documentation/git-commit.txt
parentMerge branch 'jk/maint-advise-vaddf' into maint (diff)
parentcommit: document the temporary commit message file (diff)
downloadtgif-f17adbce64efe49dcbdd3b7d14dc8b3621b5e193.tar.xz
Merge branch 'jk/maint-commit-document-editmsg' into maint
"$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log message user edits was not documented. * jk/maint-commit-document-editmsg: commit: document the temporary commit message file
Diffstat (limited to 'Documentation/git-commit.txt')
-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 2d695f619c..81853e9646 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -399,6 +399,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
--------