aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Junio C Hamano <gitster@pobox.com> 2021-08-04 13:28:55 -0700
committerGravatar Junio C Hamano <gitster@pobox.com> 2021-08-04 13:28:55 -0700
commitdfbbe8bd498d055b6371d45e7f376b5038d81403 (patch)
treeee3982277236ac7cc149f2276ab2cf91f6124c1a
parentfea3738ac550776db44eddd2cd1ab37ae1004d6b (diff)
parentf0b922473e246f4288669c2ed20a0b4b5d6dec13 (diff)
downloadgit-dfbbe8bd498d055b6371d45e7f376b5038d81403.tar.gz
git-dfbbe8bd498d055b6371d45e7f376b5038d81403.zip
Merge branch 'ar/doc-markup-fix'
Doc mark-up fix. * ar/doc-markup-fix: Documentation: render special characters correctly
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/gittutorial.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 9067c2079e..550c16ca61 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -133,7 +133,7 @@ remember to run that, set `fetch.prune` globally, or
linkgit:git-config[1].
Here's where things get tricky and more specific. The pruning feature
-doesn't actually care about branches, instead it'll prune local <->
+doesn't actually care about branches, instead it'll prune local <-->
remote-references as a function of the refspec of the remote (see
`<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above).
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 59ef5cef1f..0e0b863105 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -322,7 +322,7 @@ initiating this "pull". If Bob's work conflicts with what Alice did since
their histories forked, Alice will use her working tree and the index to
resolve conflicts, and existing local changes will interfere with the
conflict resolution process (Git will still perform the fetch but will
-refuse to merge --- Alice will have to get rid of her local changes in
+refuse to merge -- Alice will have to get rid of her local changes in
some way and pull again when this happens).
Alice can peek at what Bob did without merging first, using the "fetch"