diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-09-30 19:27:10 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-01 08:18:46 -0700 |
| commit | 5d6b3a9ef80a8bcd77b57ea14d4284b022b95a1f (patch) | |
| tree | 5bbd4e391f5a30aa07c3238f1bb810b838736952 /Documentation/githooks.txt | |
| parent | 0a1a1c8615ec0049d2d7fcd849cfddd978170752 (diff) | |
| download | git-5d6b3a9ef80a8bcd77b57ea14d4284b022b95a1f.tar.gz git-5d6b3a9ef80a8bcd77b57ea14d4284b022b95a1f.tar.xz | |
Documentation: remove '\' in front of short options
... because they show up in the man and html outputs.
This escaping is only needed for double dashes to be compatible with
older asciidoc versions; see commit e1ccf53 ([PATCH] Escape asciidoc's
built-in em-dash replacement, 2005-09-12).
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
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 046a2a7fe..7fefdb1f4 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. |