summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 19:09:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 19:09:35 (GMT)
commit1c9d71944a7a35cdfeb09200b20e261737cdc0b9 (patch)
treebc6f15dab8b0a3ad37e72521aab59f112a5386c2 /Documentation
parentaca820ae61bc376315b6bb1aea2e0006d1d273b6 (diff)
parent8e4414edde857a90ce90bb542811f1c22071f16f (diff)
downloadgit-1c9d71944a7a35cdfeb09200b20e261737cdc0b9.zip
git-1c9d71944a7a35cdfeb09200b20e261737cdc0b9.tar.gz
git-1c9d71944a7a35cdfeb09200b20e261737cdc0b9.tar.bz2
Merge branch 'jn/doc-remote-helpers'
* jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
Diffstat (limited to 'Documentation')
-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
-------------------