mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
documentation: remove unnecessary hyphens
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0a4f051f93
commit
f22fdf33af
|
@ -126,7 +126,7 @@ Terminology
|
||||||
-----------
|
-----------
|
||||||
nit: ::
|
nit: ::
|
||||||
Denotes a small issue that should be fixed, such as a typographical error
|
Denotes a small issue that should be fixed, such as a typographical error
|
||||||
or mis-alignment of conditions in an `if()` statement.
|
or misalignment of conditions in an `if()` statement.
|
||||||
|
|
||||||
aside: ::
|
aside: ::
|
||||||
optional: ::
|
optional: ::
|
||||||
|
|
|
@ -29,7 +29,7 @@ OPTIONS
|
||||||
|
|
||||||
--stdin::
|
--stdin::
|
||||||
Read pathnames from the standard input, one per line,
|
Read pathnames from the standard input, one per line,
|
||||||
instead of from the command-line.
|
instead of from the command line.
|
||||||
|
|
||||||
-z::
|
-z::
|
||||||
The output format is modified to be machine-parsable.
|
The output format is modified to be machine-parsable.
|
||||||
|
|
|
@ -130,7 +130,7 @@ When the history involves criss-cross merges, there can be more than one
|
||||||
---2---o---o---B
|
---2---o---o---B
|
||||||
....
|
....
|
||||||
|
|
||||||
both '1' and '2' are merge-bases of A and B. Neither one is better than
|
both '1' and '2' are merge bases of A and B. Neither one is better than
|
||||||
the other (both are 'best' merge bases). When the `--all` option is not given,
|
the other (both are 'best' merge bases). When the `--all` option is not given,
|
||||||
it is unspecified which best one is output.
|
it is unspecified which best one is output.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue