Merge branch 'nd/maint-clone-gitdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:21:39 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:21:39 +0000 (14:21 -0700)
* nd/maint-clone-gitdir:
  clone: allow to clone from .git file
  read_gitfile_gently(): rename misnamed function to read_gitfile()

1  2 
cache.h
refs.c
submodule.c

diff --cc cache.h
Simple merge
diff --cc refs.c
Simple merge
diff --cc submodule.c
Simple merge