mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +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>
62 lines
1.4 KiB
Text
62 lines
1.4 KiB
Text
git-shortlog(1)
|
|
===============
|
|
|
|
NAME
|
|
----
|
|
git-shortlog - Summarize 'git log' output
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
|
|
git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>...]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Summarizes 'git log' output in a format suitable for inclusion
|
|
in release announcements. Each commit will be grouped by author and
|
|
the first line of the commit message will be shown.
|
|
|
|
Additionally, "[PATCH]" will be stripped from the commit description.
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
-h, \--help::
|
|
Print a short usage message and exit.
|
|
|
|
-n, \--numbered::
|
|
Sort output according to the number of commits per author instead
|
|
of author alphabetic order.
|
|
|
|
-s, \--summary::
|
|
Suppress commit description and provide a commit count summary only.
|
|
|
|
-e, \--email::
|
|
Show the email address of each author.
|
|
|
|
FILES
|
|
-----
|
|
|
|
If the file `.mailmap` exists, it will be used for mapping author
|
|
email addresses to a real author name. One mapping per line, first
|
|
the author name followed by the email address enclosed by
|
|
'<' and '>'. Use hash '#' for comments. Example:
|
|
|
|
------------
|
|
# Keep alphabetized
|
|
Adam Morrow <adam@localhost.localdomain>
|
|
Eve Jones <eve@laptop.(none)>
|
|
------------
|
|
|
|
Author
|
|
------
|
|
Written by Jeff Garzik <jgarzik@pobox.com>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|