Merge branch 'dh/repack' (early part)

[git.git] / Documentation / git-shortlog.txt

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index b0df92e8192bc494e5d4db1707c233790560afb8..15cc6f77c1e9b8a77c8396fab99cf9d9fda98ef3 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -7,8 +7,9 @@ git-shortlog - Summarize 'git log' output
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

+[verse]

 git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
 git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]

-git-shortlog [-n|--number] [-s|--summary] [<committish>...]
+git-shortlog [-n|--numbered] [-s|--summary] [<committish>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -21,19 +22,20 @@ Additionally, "[PATCH]" will be stripped from the commit description.
 OPTIONS
 -------
 
 OPTIONS
 -------
 

--h::
+-h, \--help::

        Print a short usage message and exit.
 
        Print a short usage message and exit.
 

--n::
+-n, \--numbered::

        Sort output according to the number of commits per author instead
        of author alphabetic order.
 
        Sort output according to the number of commits per author instead
        of author alphabetic order.
 

--s::
+-s, \--summary::

        Suppress commit description and provide a commit count summary only.
 
 FILES
 -----
        Suppress commit description and provide a commit count summary only.
 
 FILES
 -----

-'.mailmap'::
+
+.mailmap::

        If this file 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
        If this file 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