Merge branch 'jk/shortlog-no-wrap-doc'

* jk/shortlog-no-wrap-doc:
git-shortlog(1): document behaviour of zero-width wrap

diff --combined Documentation/git-shortlog.txt
index afeb4cdf16df91f63197d390fdbf1540eff66837,804c84d18404d6a9e5eb8fbc89d8b3a34735f43f..c308e91537a02817560d3108be5517d1806b0c9e
--- 1/Documentation/git-shortlog.txt
--- 2/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@@ -3,26 -3,22 +3,26 @@@ git-shortlog(1
  
  NAME
  ----
 -git-shortlog - Summarize 'git-log' output
 +git-shortlog - Summarize 'git log' output
  
  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 shortlog' [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] <commit>...
  
  DESCRIPTION
  -----------
 -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.
 +Summarizes 'git log' output in a format suitable for inclusion
 +in release announcements. Each commit will be grouped by author and title.
  
  Additionally, "[PATCH]" will be stripped from the commit description.
  
 +If no revisions are passed on the command line and either standard input
 +is not a terminal or there is no current branch, 'git shortlog' will
 +output a summary of the log read from standard input, without
 +reference to the current repository.
 +
  OPTIONS
  -------
  
@@@ -43,19 -39,14 +43,22 @@@
  --email::
        Show the email address of each author.
  
 +--format[=<format>]::
 +      Instead of the commit subject, use some other information to
 +      describe each commit.  '<format>' can be any string accepted
 +      by the `--format` option of 'git log', such as '* [%h] %s'.
 +      (See the "PRETTY FORMATS" section of linkgit:git-log[1].)
 +
 +      Each pretty-printed commit will be rewrapped before it is shown.
 +
  -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.
+ +
+ If width is `0` (zero) then indent the lines of the output without wrapping
+ them.
  
  
  MAPPING AUTHORS
@@@ -67,6 -58,15 +70,6 @@@ spelled differently
  
  include::mailmap.txt[]
  
 -
 -Author
 -------
 -Written by Jeff Garzik <jgarzik@pobox.com>
 -
 -Documentation
 ---------------
 -Documentation by Junio C Hamano.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite