mirror of
https://github.com/git/git.git
synced 2024-11-18 23:03:56 +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>
36 lines
596 B
Plaintext
36 lines
596 B
Plaintext
git-stripspace(1)
|
|
=================
|
|
|
|
NAME
|
|
----
|
|
git-stripspace - Filter out empty lines
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-stripspace' [-s | --strip-comments] < <stream>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Remove multiple empty lines, and empty lines at beginning and end.
|
|
|
|
OPTIONS
|
|
-------
|
|
-s|--strip-comments::
|
|
In addition to empty lines, also strip lines starting with '#'.
|
|
|
|
<stream>::
|
|
Byte stream to act on.
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|