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

* jk/shortlog-no-wrap-doc: git-shortlog(1): document behaviour of zero-width wrap
git-mirror · Jan 14, 2013 · 74abc17 · 74abc17
2 parents 7b9ea42 + 0e82bd0
commit 74abc17
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
@@ -56,6 +56,9 @@ OPTIONS
 	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