mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
5162e69732
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.3 KiB
Text
56 lines
1.3 KiB
Text
git-fetch(1)
|
|
============
|
|
|
|
NAME
|
|
----
|
|
git-fetch - Download objects and refs from another repository
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-fetch' <options> <repository> <refspec>...
|
|
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Fetches named heads or tags from another repository, along with
|
|
the objects necessary to complete them.
|
|
|
|
The ref names and their object names of fetched refs are stored
|
|
in `.git/FETCH_HEAD`. This information is left for a later merge
|
|
operation done by "git merge".
|
|
|
|
When <refspec> stores the fetched result in tracking branches,
|
|
the tags that point at these branches are automatically
|
|
followed. This is done by first fetching from the remote using
|
|
the given <refspec>s, and if the repository has objects that are
|
|
pointed by remote tags that it does not yet have, then fetch
|
|
those missing tags. If the other end has tags that point at
|
|
branches you are not interested in, you will not get them.
|
|
|
|
|
|
OPTIONS
|
|
-------
|
|
include::fetch-options.txt[]
|
|
|
|
include::pull-fetch-param.txt[]
|
|
|
|
include::urls-remotes.txt[]
|
|
|
|
SEE ALSO
|
|
--------
|
|
linkgit:git-pull[1]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org> and
|
|
Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
-------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|