checkout: tone down the "forked status" diagnostic messages

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index d54fc3e5c6d7ba3be31fa2c1238e2d7039c92e74..c7752575d8f5f35657cb9ef5a7e9e18b82ddc8b8 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -7,7 +7,9 @@ git-shortlog - Summarize 'git log' output
 
 SYNOPSIS
 --------
-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
+[verse]
+git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
+git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>...]
 
 DESCRIPTION
 -----------
@@ -20,27 +22,32 @@ Additionally, "[PATCH]" will be stripped from the commit description.
 OPTIONS
 -------
 
--h::
+-h, \--help::
        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.
 
--s::
-       Supress commit description and provide a commit count summary only.
+-s, \--summary::
+       Suppress commit description and provide a commit count summary only.
+
+-e, \--email::
+       Show the email address of each author.
 
 FILES
 -----
-'.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
-       '<' and '>'. Use hash '#' for comments. Example:
 
-               # Keep alphabetized
-               Adam Morrow <adam@localhost.localdomain>
-               Eve Jones <eve@laptop.(none)>
+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
 ------
@@ -52,5 +59,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite