Skip to content

Commit 70661d2

Browse files
rybakgitster
authored andcommitted
Documentation: render dash correctly
Three hyphens are rendered verbatim in documentation, so "--" has to be used to produce a dash. Fix asciidoc output for dashes. This is similar to previous commits f0b9224 (Documentation: render special characters correctly, 2021-07-29) and de82095 (doc hash-function-transition: fix asciidoc output, 2021-02-05). Signed-off-by: Andrei Rybak <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 844ede3 commit 70661d2

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Documentation/git-apply.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ behavior:
208208
* `warn` outputs warnings for a few such errors, but applies the
209209
patch as-is (default).
210210
* `fix` outputs warnings for a few such errors, and applies the
211-
patch after fixing them (`strip` is a synonym --- the tool
211+
patch after fixing them (`strip` is a synonym -- the tool
212212
used to consider only trailing whitespace characters as errors, and the
213213
fix involved 'stripping' them, but modern Gits do more).
214214
* `error` outputs warnings for a few such errors, and refuses

Documentation/git-read-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ see which of the "local changes" that you made were carried forward by running
219219
`git diff-index --cached $M`. Note that this does not
220220
necessarily match what `git diff-index --cached $H` would have
221221
produced before such a two tree merge. This is because of cases
222-
18 and 19 --- if you already had the changes in $M (e.g. maybe
222+
18 and 19 -- if you already had the changes in $M (e.g. maybe
223223
you picked it up via e-mail in a patch form), `git diff-index
224224
--cached $H` would have told you about the change before this
225225
merge, but it would not show in `git diff-index --cached $M`

Documentation/git.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ The file parameters can point at the user's working file
619619
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
620620
when a new file is added), or a temporary file (e.g. `old-file` in the
621621
index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the
622-
temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits.
622+
temporary file -- it is removed when `GIT_EXTERNAL_DIFF` exits.
623623
+
624624
For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1
625625
parameter, <path>.

Documentation/gitformat-signature.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ line.
3737
This is even true for an originally empty line. In the following
3838
examples, the end of line that ends with a whitespace letter is
3939
highlighted with a `$` sign; if you are trying to recreate these
40-
example by hand, do not cut and paste them---they are there
40+
example by hand, do not cut and paste them--they are there
4141
primarily to highlight extra whitespace at the end of some lines.
4242

4343
The signed payload and the way the signature is embedded depends

Documentation/technical/hash-function-transition.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ hash re-encode during clone and to encourage peers to modernize.
562562
The design described here allows fetches by SHA-1 clients of a
563563
personal SHA-256 repository because it's not much more difficult than
564564
allowing pushes from that repository. This support needs to be guarded
565-
by a configuration option --- servers like git.kernel.org that serve a
565+
by a configuration option -- servers like git.kernel.org that serve a
566566
large number of clients would not be expected to bear that cost.
567567

568568
Meaning of signatures

Documentation/technical/rerere.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ conflict to leave line D means that the user declares:
9999
compatible with what AB and AC wanted to do.
100100

101101
So the conflict we would see when merging AB into ACAB should be
102-
resolved the same way---it is the resolution that is in line with that
102+
resolved the same way--it is the resolution that is in line with that
103103
declaration.
104104

105105
Imagine that similarly previously a branch XYXZ was forked from XY,

0 commit comments

Comments
 (0)