summaryrefslogtreecommitdiff
path: root/Documentation/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-09 01:40:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-09 01:40:08 -0700
commit0bb3a0ba9e3cbb283a747e4736bcf7484d076a73 (patch)
tree8e922c74687a8f335ea422a0eb9643a54d0d8c9b /Documentation/pull-fetch-param.txt
parenta9fd1383a73878284d4157b20ac7c735e876102e (diff)
parent0f4f4d1597219bad74c4fde624321d8a05d1b55e (diff)
downloadgit-0bb3a0ba9e3cbb283a747e4736bcf7484d076a73.tar.gz
Merge branch 'maint'
* maint: asciidoc markup fixes Fail properly when cloning from invalid HTTP URL Conflicts: Documentation/git-push.txt
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
-rw-r--r--Documentation/pull-fetch-param.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 00a8d21047..ebdd948cd2 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -6,7 +6,7 @@
<refspec>::
The canonical format of a <refspec> parameter is
- `+?<src>:<dst>`; that is, an optional plus `+`, followed
+ `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
by the source ref, followed by a colon `:`, followed by
the destination ref.
+