Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:51 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:51 +0000 (14:48 -0700)
commita7aebb9d00332364411e85c703cc25dc0580f2d4
treec1930a07e087ae511025391a012a734c98a4b8a6
parentdbc1b1f71052c084a84b5c395e1cb4b5ae526fcb
parent04ce83e2b9a1f1512d3d0c873e8f13d06761620c
Merge branch 'maint'

* maint:
  show-branch: fix segfault when showbranch.default exists
builtin-show-branch.c