Merge branches 'jc/clone' and 'jc/name'

* jc/clone:
git-clone: typofix.
clone: record the remote primary branch with remotes/$origin/HEAD
revamp git-clone (take #2).
revamp git-clone.
fetch,parse-remote,fmt-merge-msg: refs/remotes/* support

* jc/name:
sha1_name: make core.warnambiguousrefs the default.
sha1_name: warning ambiguous refs.
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.

diff --cc blame.c
index 7e88833a37f9a2b7380b96510a331cf376c99264,90338af31cf1f532891d8e34ede6c5cf9f72681f,270ca52c3abf4b8d51aba4c57693f6c72800bb14..396defccc728db836732aa140e54620775509760
--- 1/blame.c
--- 2/blame.c
--- 3/blame.c
+++ b/blame.c
@@@@ -748,10 -588,8 -748,11 +748,11 @@@@ int main(int argc, const char **argv
        struct commit_info ci;
        const char *buf;
        int max_digits;
  -     size_t longest_file, longest_author;
 ++     int longest_file, longest_author;
 +      int found_rename;
   
        const char* prefix = setup_git_directory();
++      git_config(git_default_config);
   
        for(i = 1; i < argc; i++) {
                if(options) {

diff --cc git-fetch.sh
Simple merge