Code

Merge branch 'jc/maint-clone-alternates' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:27:33 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:27:33 +0000 (14:27 -0700)
* jc/maint-clone-alternates:
  clone: clone from a repository with relative alternates
  clone: allow more than one --reference

1  2 
builtin/clone.c
sha1_file.c
t/t5601-clone.sh

diff --cc builtin/clone.c
Simple merge
diff --cc sha1_file.c
Simple merge
Simple merge