mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Format tweaks for asciidoc.
Some documentation "options" were followed by independent preformatted paragraphs. Now they are associated plain text paragraphs. The difference is clear in the generated html. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
3103cf9e1e
commit
b0d08a504b
|
@ -24,12 +24,12 @@ OPTIONS
|
|||
|
||||
<option>...::
|
||||
Either an option to pass to `grep` or `git-ls-files`.
|
||||
|
||||
+
|
||||
The following are the specific `git-ls-files` options
|
||||
that may be given: `-o`, `--cached`, `--deleted`, `--others`,
|
||||
`--killed`, `--ignored`, `--modified`, `--exclude=*`,
|
||||
`--exclude-from=*`, and `--exclude-per-directory=*`.
|
||||
|
||||
`--killed`, `--ignored`, `--modified`, `--exclude=\*`,
|
||||
`--exclude-from=\*`, and `--exclude-per-directory=\*`.
|
||||
+
|
||||
All other options will be passed to `grep`.
|
||||
|
||||
<pattern>::
|
||||
|
|
|
@ -47,7 +47,7 @@ OPTIONS
|
|||
By default, differences for merge commits are not shown.
|
||||
With this flag, show differences to that commit from all
|
||||
of its parents.
|
||||
|
||||
+
|
||||
However, it is not very useful in general, although it
|
||||
*is* useful on a file-by-file basis.
|
||||
|
||||
|
|
Loading…
Reference in a new issue