Merge branch 'jk/clone-cmdline-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:24 +0000 (09:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:24 +0000 (09:45 -0700)
* jk/clone-cmdline-config:
  clone: accept config options on the command line
  config: make git_config_parse_parameter a public function
  remote: use new OPT_STRING_LIST
  parse-options: add OPT_STRING_LIST helper

1  2 
builtin/remote.c
cache.h
config.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge