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

diff --cc builtin/clone.c
index 7663bc22c9a3cb35b803815762791fec44d4c477,16b4fba71f8fed16ac67ee09b186e0295fc6b6da..4d66a7f4e82e5e31a0250491bbe22f9ec9ac3bfe
--- 1/builtin/clone.c
--- 2/builtin/clone.c
+++ b/builtin/clone.c
@@@ -46,7 -46,16 +46,17 @@@ static const char *real_git_dir
  static char *option_upload_pack = "git-upload-pack";
  static int option_verbosity;
  static int option_progress;
 +static struct string_list option_config;
+ static struct string_list option_reference;
+ 
+ static int opt_parse_reference(const struct option *opt, const char *arg, int unset)
+ {
+       struct string_list *option_reference = opt->value;
+       if (!arg)
+               return -1;
+       string_list_append(option_reference, arg);
+       return 0;
+ }
  
  static struct option builtin_clone_options[] = {
        OPT__VERBOSITY(&option_verbosity),

diff --cc sha1_file.c
Simple merge