Merge branch 'jc/maint-clone-alternates' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:58:50 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:58:50 +0000 (15:58 -0700)
commit7280debd526bc019f684c6ef9219b0d84e163780
tree8f2a47418966affefc9dff46ac8a191a06289ba7
parent93ba50906cb38177af6837ad6e5d3357595782c2
parente6baf4a1ae1bb75d59967066ade1290cf105dcd8
Merge branch 'jc/maint-clone-alternates' into next

* jc/maint-clone-alternates:
  clone: clone from a repository with relative alternates
  clone: allow more than one --reference

Conflicts:
builtin/clone.c
builtin/clone.c
sha1_file.c