From: Junio C Hamano Date: Tue, 24 Jul 2012 21:05:22 +0000 (-0700) Subject: Merge branch 'jk/maint-commit-document-editmsg' X-Git-Tag: v1.7.12-rc1~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32?hp=-c 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 --- 9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32 diff --combined Documentation/git-commit.txt index f400835921,81853e9646..4622297ec9 --- a/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 --------