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

* ak/show-branch-usage-string:
  show-branch: line-wrap show-branch usage
builtin/show-branch.c