Merge branch 'jk/clone-b'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Sep 2009 22:24:53 +0000 (15:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Sep 2009 22:24:53 +0000 (15:24 -0700)
* jk/clone-b:
  clone: add --branch option to select a different HEAD

1  2 
Documentation/git-clone.txt
builtin-clone.c

Simple merge
diff --cc builtin-clone.c
index 0f231d8af5880d96f70729d89602960d8252f4a0,9d79301b8e373baa0cadccf8dc4ee3f4ed39e8b6..ad048085f3587a40eccede3e86dd526f2b446f89
@@@ -38,9 -38,10 +38,10 @@@ static const char * const builtin_clone
  };
  
  static int option_quiet, option_no_checkout, option_bare, option_mirror;
 -static int option_local, option_no_hardlinks, option_shared;
 +static int option_local, option_no_hardlinks, option_shared, option_recursive;
  static char *option_template, *option_reference, *option_depth;
  static char *option_origin = NULL;
+ static char *option_branch = NULL;
  static char *option_upload_pack = "git-upload-pack";
  static int option_verbose;