mirror of
https://github.com/git/git.git
synced 2024-06-19 08:59:09 +02: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
608 B
Plaintext
35 lines
608 B
Plaintext
git-mktree(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-mktree - Build a tree-object from ls-tree formatted text
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-mktree' [-z]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Reads standard input in non-recursive `ls-tree` output format,
|
|
and creates a tree object. The object name of the tree object
|
|
built is written to the standard output.
|
|
|
|
OPTIONS
|
|
-------
|
|
-z::
|
|
Read the NUL-terminated `ls-tree -z` output instead.
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|