diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:02:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:02:45 -0700 |
| commit | 24263cfb54471c4c321f204e45ac3fcfe5485614 (patch) | |
| tree | ae339af7b6cc827f769fba892fd83d2522281076 /Documentation | |
| parent | c72b9143f90f839fdfe34ea252e84cb43be71d95 (diff) | |
| parent | 8e4414edde857a90ce90bb542811f1c22071f16f (diff) | |
| download | git-24263cfb54471c4c321f204e45ac3fcfe5485614.tar.gz git-24263cfb54471c4c321f204e45ac3fcfe5485614.tar.xz | |
Merge branch 'jn/doc-remote-helpers' into maint
* jn/doc-remote-helpers:
Documentation: do not misinterpret refspecs as bold text
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-remote-helpers.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt index 87cd11f2c..58f6ad499 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 ------------------- |