Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2011 22:25:44 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2011 22:25:44 +0000 (15:25 -0700)
* maint:
  init/clone: remove short option -L and document --separate-git-dir

1  2 
builtin/clone.c
builtin/init-db.c
t/t0001-init.sh

diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc t/t0001-init.sh
Simple merge