mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +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>
60 lines
1.5 KiB
Text
60 lines
1.5 KiB
Text
git-quiltimport(1)
|
|
================
|
|
|
|
NAME
|
|
----
|
|
git-quiltimport - Applies a quilt patchset onto the current branch
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'git-quiltimport' [--dry-run] [--author <author>] [--patches <dir>]
|
|
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Applies a quilt patchset onto the current git branch, preserving
|
|
the patch boundaries, patch order, and patch descriptions present
|
|
in the quilt patchset.
|
|
|
|
For each patch the code attempts to extract the author from the
|
|
patch description. If that fails it falls back to the author
|
|
specified with --author. If the --author flag was not given
|
|
the patch description is displayed and the user is asked to
|
|
interactively enter the author of the patch.
|
|
|
|
If a subject is not found in the patch description the patch name is
|
|
preserved as the 1 line subject in the git description.
|
|
|
|
OPTIONS
|
|
-------
|
|
--dry-run::
|
|
Walk through the patches in the series and warn
|
|
if we cannot find all of the necessary information to commit
|
|
a patch. At the time of this writing only missing author
|
|
information is warned about.
|
|
|
|
--author Author Name <Author Email>::
|
|
The author name and email address to use when no author
|
|
information can be found in the patch description.
|
|
|
|
--patches <dir>::
|
|
The directory to find the quilt patches and the
|
|
quilt series file.
|
|
+
|
|
The default for the patch directory is patches
|
|
or the value of the $QUILT_PATCHES environment
|
|
variable.
|
|
|
|
Author
|
|
------
|
|
Written by Eric Biederman <ebiederm@lnxi.com>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Eric Biederman <ebiederm@lnxi.com>
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|