Skip to content

Commit f0b9224

Browse files
rybakgitster
authored andcommitted
Documentation: render special characters correctly
Three hyphens are rendered verbatim, so "--" has to be used to produce a dash. There is no double arrow ("<->" is rendered as "<→"), so a left and right arrow "<-->" have to be combined for that. So fix asciidoc output for special characters. This is similar to fixes in commit de82095 (doc hash-function-transition: fix asciidoc output, 2021-02-05). Signed-off-by: Andrei Rybak <[email protected]> Acked-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ebf3c04 commit f0b9224

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/git-fetch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ remember to run that, set `fetch.prune` globally, or
133133
linkgit:git-config[1].
134134

135135
Here's where things get tricky and more specific. The pruning feature
136-
doesn't actually care about branches, instead it'll prune local <->
136+
doesn't actually care about branches, instead it'll prune local <-->
137137
remote-references as a function of the refspec of the remote (see
138138
`<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above).
139139

Documentation/gittutorial.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ initiating this "pull". If Bob's work conflicts with what Alice did since
322322
their histories forked, Alice will use her working tree and the index to
323323
resolve conflicts, and existing local changes will interfere with the
324324
conflict resolution process (Git will still perform the fetch but will
325-
refuse to merge --- Alice will have to get rid of her local changes in
325+
refuse to merge -- Alice will have to get rid of her local changes in
326326
some way and pull again when this happens).
327327

328328
Alice can peek at what Bob did without merging first, using the "fetch"

0 commit comments

Comments
 (0)