diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-26 08:22:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 08:22:53 (GMT) |
| commit | be1295d16a2593dcf468fef7d9e811d057d9039f (patch) | |
| tree | be6b2dd6d2b6cf2182e339dc75d33fc3d7a9125e /rev-parse.c | |
| parent | 692c7fc9cb81a2f68b23199d5b8612494fe4d317 (diff) | |
| parent | 4c2e98d6ce47aa9fcc1598c68e630f371cd4f8cb (diff) | |
| parent | 1b371f567d9b0094918e128262577b76994eef74 (diff) | |
| download | git-be1295d16a2593dcf468fef7d9e811d057d9039f.zip git-be1295d16a2593dcf468fef7d9e811d057d9039f.tar.gz git-be1295d16a2593dcf468fef7d9e811d057d9039f.tar.bz2 | |
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.