Merge branch 'ak/show-branch-usage-string'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:37:07 +0000 (12:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:37:07 +0000 (12:37 -0800)
* ak/show-branch-usage-string:
show-branch: line-wrap show-branch usage

1  2 
builtin/show-branch.c
Simple merge