Merge branch 'jk/shortlog-no-wrap-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:59:03 +0000 (07:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:59:03 +0000 (07:59 -0800)
* jk/shortlog-no-wrap-doc:
git-shortlog(1): document behaviour of zero-width wrap

1  2 
Documentation/git-shortlog.txt
Simple merge