Document -w option to shortlog

Noticed by Fredrik Noring.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c7752575d8f5f35657cb9ef5a7e9e18b82ddc8b8..d7cb4c0468e713543042d41ff57a638a7fda2881 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
-git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<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
 -----------


@@ -35,6 +35,12 @@ OPTIONS
 -e, \--email::
        Show the email address of each author.
 
 -e, \--email::
        Show the email address of each author.
 

+-w[<width>[,<indent1>[,<indent2>]]]::
+       Linewrap the output by wrapping each line at `width`.  The first
+       line of each entry is indented by `indent1` spaces, and the second
+       and subsequent lines are indented by `indent2` spaces. `width`,
+       `indent1`, and `indent2` default to 76, 6 and 9 respectively.
+

 FILES
 -----
 
 FILES
 -----
 

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index f08095bc91b92ad93560459d060259bd5df52c4a..01cfd7b47c120133eafaf0701bc721fbf50fddc5 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -8,7 +8,7 @@
 #include "mailmap.h"
 
 static const char shortlog_usage[] =
 #include "mailmap.h"
 
 static const char shortlog_usage[] =

-"git-shortlog [-n] [-s] [-e] [<commit-id>... ]";
+"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";

 
 static char *common_repo_prefix;
 static int email;
 
 static char *common_repo_prefix;
 static int email;