summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-05-30 10:52:56 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 12:55:16 -0700
commit8e4414edde857a90ce90bb542811f1c22071f16f (patch)
treed60880233d0a186a745b94a390ee6313d71e1352
parentMerge branch 'jm/maint-misc-fix' into maint (diff)
downloadtgif-8e4414edde857a90ce90bb542811f1c22071f16f.tar.xz
Documentation: do not misinterpret refspecs as bold text
In v1.7.3.3~2 (Documentation: do not misinterpret pull refspec as bold text, 2010-12-03) many uses of asterisks in expressions like "refs/heads/*:refs/svn/origin/branches/*" were escaped as {asterisk} to avoid being treated as delimiters for bold text, but these two were missed. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-remote-helpers.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt
index 87cd11f2c4..58f6ad4994 100644
--- a/Documentation/git-remote-helpers.txt
+++ b/Documentation/git-remote-helpers.txt
@@ -181,11 +181,11 @@ CAPABILITIES
When using the import command, expect the source ref to have
been written to the destination ref. The earliest applicable
refspec takes precedence. For example
- "refs/heads/*:refs/svn/origin/branches/*" means that, after an
- "import refs/heads/name", the script has written to
+ "refs/heads/{asterisk}:refs/svn/origin/branches/{asterisk}" means
+ that, after an "import refs/heads/name", the script has written to
refs/svn/origin/branches/name. If this capability is used at
all, it must cover all refs reported by the list command; if
- it is not used, it is effectively "*:*"
+ it is not used, it is effectively "{asterisk}:{asterisk}"
REF LIST ATTRIBUTES
-------------------