mirror of
https://github.com/git/git.git
synced 2024-11-14 21:23:03 +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>
35 lines
604 B
Text
35 lines
604 B
Text
git-unpack-file(1)
|
|
==================
|
|
|
|
NAME
|
|
----
|
|
git-unpack-file - Creates a temporary file with a blob's contents
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-unpack-file' <blob>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Creates a file holding the contents of the blob specified by sha1. It
|
|
returns the name of the temporary file in the following format:
|
|
.merge_file_XXXXX
|
|
|
|
OPTIONS
|
|
-------
|
|
<blob>::
|
|
Must be a blob id
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|