Merge branch 'jc/post-simplify' (early part) into tr/filter-branch

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

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index d7cb4c0468e713543042d41ff57a638a7fda2881..7ccf31ccc401fd35a0ed65667be001805436249b 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -3,17 +3,17 @@ git-shortlog(1)
 
 NAME
 ----
 
 NAME
 ----

-git-shortlog - Summarize 'git log' output
+git-shortlog - Summarize 'git-log' output

 
 SYNOPSIS
 --------
 [verse]
 
 SYNOPSIS
 --------
 [verse]

-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w]
-git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
+git log --pretty=short | 'git shortlog' [-h] [-n] [-s] [-e] [-w]
+git shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]

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

-Summarizes 'git log' output in a format suitable for inclusion
+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.
 
 in release announcements. Each commit will be grouped by author and
 the first line of the commit message will be shown.
 


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

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

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

--n, \--numbered::
+-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, \--summary::
+-s::
+--summary::

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

--e, \--email::
+-e::
+--email::

        Show the email address of each author.
 
 -w[<width>[,<indent1>[,<indent2>]]]::
        Show the email address of each author.
 
 -w[<width>[,<indent1>[,<indent2>]]]::


@@ -65,4 +69,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite