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>
43 lines
937 B
Plaintext
43 lines
937 B
Plaintext
git-merge-base(1)
|
|
=================
|
|
|
|
NAME
|
|
----
|
|
git-merge-base - Find as good common ancestors as possible for a merge
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-merge-base' [--all] <commit> <commit>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
|
|
"git-merge-base" finds as good a common ancestor as possible between
|
|
the two commits. That is, given two commits A and B 'git-merge-base A
|
|
B' will output a commit which is reachable from both A and B through
|
|
the parent relationship.
|
|
|
|
Given a selection of equally good common ancestors it should not be
|
|
relied on to decide in any particular way.
|
|
|
|
The "git-merge-base" algorithm is still in flux - use the source...
|
|
|
|
OPTIONS
|
|
-------
|
|
--all::
|
|
Output all common ancestors for the two commits instead of
|
|
just one.
|
|
|
|
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
|