Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2008 04:47:38 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2008 04:47:38 +0000 (21:47 -0700)
* maint-1.5.4:
Remove 'header' from --signoff option description

1  2 
builtin-commit.c
Simple merge