diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-01 08:56:36 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-01 08:56:36 -0700 |
| commit | 5e22e21769454857e00bc55be1f2eef8d873ba72 (patch) | |
| tree | 687bc5971a302f01f6ef5f192ad18c59d590ad3f /Documentation/githooks.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | Improve git-log documentation wrt file filters (diff) | |
| download | tgif-5e22e21769454857e00bc55be1f2eef8d873ba72.tar.xz | |
Merge branch 'maint'
* maint:
Improve git-log documentation wrt file filters
Documentation: remove '\' in front of short options
Diffstat (limited to 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 046a2a7fe7..7fefdb1f45 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -87,12 +87,12 @@ default log message, and before the editor is started. It takes one to three parameters. The first is the name of the file that the commit log message. The second is the source of the commit -message, and can be: `message` (if a `\-m` or `\-F` option was -given); `template` (if a `\-t` option was given or the +message, and can be: `message` (if a `-m` or `-F` option was +given); `template` (if a `-t` option was given or the configuration option `commit.template` is set); `merge` (if the commit is a merge or a `.git/MERGE_MSG` file exists); `squash` (if a `.git/SQUASH_MSG` file exists); or `commit`, followed by -a commit SHA1 (if a `\-c`, `\-C` or `\--amend` option was given). +a commit SHA1 (if a `-c`, `-C` or `\--amend` option was given). If the exit status is non-zero, 'git-commit' will abort. |