From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:07:20 +0000 (-0700)
Subject: Merge branch 'nd/commit-hook-doc-fix'
X-Git-Tag: v2.13.0-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbcfbc4d5de6b307a9a7dc12fb6e969914abd17c?ds=sidebyside;hp=-c

Merge branch 'nd/commit-hook-doc-fix'

Doc fix.

* nd/commit-hook-doc-fix:
git-commit.txt: list post-rewrite in HOOKS section
---

fbcfbc4d5de6b307a9a7dc12fb6e969914abd17c
diff --combined Documentation/git-commit.txt
index 25dcdcc289,2763edb7a7..ed0f5b94b3
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -117,12 -117,9 +117,12 @@@ OPTION
  
  -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.
 +	When showing `short` or `porcelain` status output, print the
 +	filename verbatim and terminate the entries with NUL, instead of LF.
 +	If no format is given, implies the `--porcelain` output format.
 +	Without the `-z` option, filenames with "unusual" characters are
 +	quoted as explained for the configuration variable `core.quotePath`
 +	(see linkgit:git-config[1]).
  
  -F <file>::
  --file=<file>::
@@@ -463,7 -460,7 +463,7 @@@ order).  See linkgit:git-var[1] for det
  HOOKS
  -----
  This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,
- and `post-commit` hooks.  See linkgit:githooks[5] for more
+ `post-commit` and `post-rewrite` hooks.  See linkgit:githooks[5] for more
  information.
  
  FILES