Merge branch 'ns/init-mkdir' into jch
commit14908cd6c53db67c20db13ed9e21ca4bf10e8541
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:16 +0000 (2 23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:16 +0000 (2 23:11 -0700)
tree82bef5b1558e95513f97839818915a5802b6114c
parent28131f2c9631e23be7d6d2f2b69675a767010341
parent53d48885931614a43e414e1272a7f126f8d0c901
Merge branch 'ns/init-mkdir' into jch

* ns/init-mkdir:
  git init: optionally allow a directory argument

Conflicts:
builtin-init-db.c
builtin-init-db.c