Merge branch 'nd/maint-clone-gitdir' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Aug 2011 19:37:14 +0000 (12:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Aug 2011 19:37:15 +0000 (12:37 -0700)
commitcbf052b6d851e5ddf32268d78cca8969f18181c6
treefe9b455d6a7cba1ae067bfefee397cedcdc5ef47
parent398e7648197aa22c6548a362446d086835a92882
parent9b0ebc722cfc12bd14934aab5cf77ebe654e36e6
Merge branch 'nd/maint-clone-gitdir' into next

* nd/maint-clone-gitdir:
  clone: allow to clone from .git file
  read_gitfile_gently(): rename misnamed function to read_gitfile()

Conflicts:
cache.h
builtin/clone.c
cache.h
environment.c
refs.c
setup.c
submodule.c
t/t5601-clone.sh