From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Oct 2009 21:48:44 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.4-show-branch-default' into maint
X-Git-Tag: v1.6.5-rc3~6^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04ce83e2b9a1f1512d3d0c873e8f13d06761620c?ds=sidebyside;hp=04ce83e2b9a1f1512d3d0c873e8f13d06761620c

Merge branch 'jc/maint-1.6.4-show-branch-default' into maint

* jc/maint-1.6.4-show-branch-default:
show-branch: fix segfault when showbranch.default exists
---