summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-01 21:02:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-01 21:02:45 (GMT)
commit24263cfb54471c4c321f204e45ac3fcfe5485614 (patch)
treeae339af7b6cc827f769fba892fd83d2522281076
parentc72b9143f90f839fdfe34ea252e84cb43be71d95 (diff)
parent8e4414edde857a90ce90bb542811f1c22071f16f (diff)
downloadgit-24263cfb54471c4c321f204e45ac3fcfe5485614.zip
git-24263cfb54471c4c321f204e45ac3fcfe5485614.tar.gz
git-24263cfb54471c4c321f204e45ac3fcfe5485614.tar.bz2
Merge branch 'jn/doc-remote-helpers' into maint
* jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
-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 87cd11f..58f6ad4 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
-------------------