mirror of
https://github.com/git/git.git
synced 2024-10-28 21:07:52 +01:00
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>
This commit is contained in:
parent
0a1a1c8615
commit
5d6b3a9ef8
2 changed files with 6 additions and 6 deletions
|
@ -32,9 +32,9 @@ SYNOPSIS
|
||||||
[ \--cherry-pick ]
|
[ \--cherry-pick ]
|
||||||
[ \--encoding[=<encoding>] ]
|
[ \--encoding[=<encoding>] ]
|
||||||
[ \--(author|committer|grep)=<pattern> ]
|
[ \--(author|committer|grep)=<pattern> ]
|
||||||
[ \--regexp-ignore-case | \-i ]
|
[ \--regexp-ignore-case | -i ]
|
||||||
[ \--extended-regexp | \-E ]
|
[ \--extended-regexp | -E ]
|
||||||
[ \--fixed-strings | \-F ]
|
[ \--fixed-strings | -F ]
|
||||||
[ \--date={local|relative|default|iso|rfc|short} ]
|
[ \--date={local|relative|default|iso|rfc|short} ]
|
||||||
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
|
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
|
||||||
[ \--pretty | \--header ]
|
[ \--pretty | \--header ]
|
||||||
|
|
|
@ -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
|
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
|
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
|
message, and can be: `message` (if a `-m` or `-F` option was
|
||||||
given); `template` (if a `\-t` option was given or the
|
given); `template` (if a `-t` option was given or the
|
||||||
configuration option `commit.template` is set); `merge` (if the
|
configuration option `commit.template` is set); `merge` (if the
|
||||||
commit is a merge or a `.git/MERGE_MSG` file exists); `squash`
|
commit is a merge or a `.git/MERGE_MSG` file exists); `squash`
|
||||||
(if a `.git/SQUASH_MSG` file exists); or `commit`, followed by
|
(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.
|
If the exit status is non-zero, 'git-commit' will abort.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue