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

diff --combined Documentation/git-commit.txt
index f400835921803ad66a5021524de4fb9d3369f0be,81853e9646dbe657e89e353785c4beda01c545b3..4622297ec98cddc2e1f2e4417b9eeec11a3c91b1
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -101,16 -101,12 +101,16 @@@ OPTION
        When doing a dry-run, give the output in the short-format. See
        linkgit:git-status[1] for details. Implies `--dry-run`.
  
 +--branch::
 +      Show the branch and tracking info even in short-format.
 +
  --porcelain::
        When doing a dry-run, give the output in a porcelain-ready
        format. See linkgit:git-status[1] for details. Implies
        `--dry-run`.
  
  -z::
 +--null::
        When showing `short` or `porcelain` status output, terminate
        entries in the status output with NUL, instead of LF. If no
        format is given, implies the `--porcelain` output format.
@@@ -193,10 -189,6 +193,10 @@@
        current tip -- if it was a merge, it will have the parents of
        the current tip as parents -- so the current top commit is
        discarded.
 +
 +--no-post-rewrite::
 +      Bypass the post-rewrite hook.
 +
  +
  --
  It is a rough equivalent for:
@@@ -407,6 -399,15 +407,15 @@@ This command can run `commit-msg`, `pre
  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
  --------