Merge branch 'lh/submodule'

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

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index d54fc3e5c6d7ba3be31fa2c1238e2d7039c92e74..2220ef6ea8d3bfa58f3c1279dfcf4f735c2dae0a 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -7,7 +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|--numbered] [-s|--summary] [<committish>...]

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


@@ -20,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::
-       Supress commit description and provide a commit count summary only.
+-s, \--summary::
+       Suppress commit description and provide a commit count summary only.

 
 FILES
 -----
 
 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


@@ -53,4 +56,3 @@ Documentation by Junio C Hamano.
 GIT
 ---
 Part of the gitlink:git[7] suite
 GIT
 ---
 Part of the gitlink:git[7] suite

-