Code

Merge branch 'jc/maint-clone-alternates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:21 +0000 (21:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:21 +0000 (21:19 -0700)
commit2478bd8318c3ad6eceb7b99f01db29499f63b759
tree348ff68ae5741134d1b8ee2e8ad174f18e853ab3
parentf946b465d7fa13a235dd5653d37c7babb1ceb233
parente6baf4a1ae1bb75d59967066ade1290cf105dcd8
Merge branch 'jc/maint-clone-alternates'

* 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