mirror of
https://github.com/git/git.git
synced 2024-06-18 20:09:54 +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>
32 lines
510 B
Plaintext
32 lines
510 B
Plaintext
git-annotate(1)
|
|
===============
|
|
|
|
NAME
|
|
----
|
|
git-annotate - Annotate file lines with commit info
|
|
|
|
SYNOPSIS
|
|
--------
|
|
git-annotate [options] file [revision]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Annotates each line in the given file with information from the commit
|
|
which introduced the line. Optionally annotate from a given revision.
|
|
|
|
OPTIONS
|
|
-------
|
|
include::blame-options.txt[]
|
|
|
|
SEE ALSO
|
|
--------
|
|
linkgit:git-blame[1]
|
|
|
|
AUTHOR
|
|
------
|
|
Written by Ryan Anderson <ryan@michonline.com>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|