mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17: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
887 B
Text
36 lines
887 B
Text
git-merge-tree(1)
|
|
=================
|
|
|
|
NAME
|
|
----
|
|
git-merge-tree - Show three-way merge without touching index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-merge-tree' <base-tree> <branch1> <branch2>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Reads three treeish, and output trivial merge results and
|
|
conflicting stages to the standard output. This is similar to
|
|
what three-way read-tree -m does, but instead of storing the
|
|
results in the index, the command outputs the entries to the
|
|
standard output.
|
|
|
|
This is meant to be used by higher level scripts to compute
|
|
merge results outside index, and stuff the results back into the
|
|
index. For this reason, the output from the command omits
|
|
entries that match <branch1> tree.
|
|
|
|
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
|