From: Junio C Hamano <junkio@cox.net>
Date: Sun, 26 Mar 2006 08:22:53 +0000 (-0800)
Subject: Merge branches 'jc/clone' and 'jc/name'
X-Git-Tag: v1.3.0-rc1~4^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be1295d16a2593dcf468fef7d9e811d057d9039f?ds=inline;hp=be1295d16a2593dcf468fef7d9e811d057d9039f

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.
---