Merge branch 'maint-1.5.4' into maint
commit5736a3747120d6215de4fdfcf45f4a168a8d024e
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2008 04:47:38 +0000 (27 21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2008 04:47:38 +0000 (27 21:47 -0700)
tree0549814532ce97e4931fe2a0e915edf507c41050
parent1ce89cc4bb18b0e66f7073562d6634f6a9841335
parent362b0dd523f5162e7c55c76b5d0af7ad830e0e83
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  Remove 'header' from --signoff option description
builtin-commit.c