Merge branch 'maint-1.6.1' into maint
commitcbc8c6104199ffa63b61f4e8dee32d3a713e2939
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 22:41:00 +0000 (22 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 22:41:00 +0000 (22 15:41 -0700)
treeaa7e639833cc278936c34a7a714df3a9466a7927
parent93467ee660ed1c145fe91ee8928220be6ef9a51c
parent0abd52772bcb82a7293bb1c2bd351fbe303abaf1
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  everyday: use the dashless form of git-init