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 de82095a95 (doc hash-function-transition: fix asciidoc output, 2021-02-05). Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrei Rybak committed
Jul 29, 2021 at 13:02 UTC
f0b922473e246f4288669c2ed20a0b4b5d6dec13
2 files changed
+2
-2
Documentation/git-fetch.txt
+1
-1
@@ -133,7 +133,7 @@ remember to run that, set `fetch.prune` globally, or
133
linkgit:git-config[1].
134
135
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 <-->
137
remote-references as a function of the refspec of the remote (see
138
`<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above).
139
Documentation/gittutorial.txt
+1
-1
@@ -322,7 +322,7 @@ initiating this "pull". If Bob's work conflicts with what Alice did since
322
their histories forked, Alice will use her working tree and the index to
323
resolve conflicts, and existing local changes will interfere with the
324
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
326
some way and pull again when this happens).
327
328
Alice can peek at what Bob did without merging first, using the "fetch"