Merge branch 'jc/maint-1.6.4-show-branch-default' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:44 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:44 +0000 (14:48 -0700)
commit04ce83e2b9a1f1512d3d0c873e8f13d06761620c
tree2ac6b140088072d7b01f44b86a36490f2dc318e0
parentbb8cccd01762d26c832b85d3b09798650e294c5f
parent3af1cae469555485cd3ef003aa2a55bd2a4f544f
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
builtin-show-branch.c