mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00: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>
46 lines
1 KiB
Plaintext
46 lines
1 KiB
Plaintext
git-hash-object(1)
|
|
==================
|
|
|
|
NAME
|
|
----
|
|
git-hash-object - Compute object ID and optionally creates a blob from a file
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-hash-object' [-t <type>] [-w] [--stdin] [--] <file>...
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Computes the object ID value for an object with specified type
|
|
with the contents of the named file (which can be outside of the
|
|
work tree), and optionally writes the resulting object into the
|
|
object database. Reports its object ID to its standard output.
|
|
This is used by "git-cvsimport" to update the index
|
|
without modifying files in the work tree. When <type> is not
|
|
specified, it defaults to "blob".
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
-t <type>::
|
|
Specify the type (default: "blob").
|
|
|
|
-w::
|
|
Actually write the object into the object database.
|
|
|
|
--stdin::
|
|
Read the object from standard input instead of from a file.
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|