Andrew's git / gitweb.git / diff
?
Merge branch 'jc/name' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:52:42 +0000 (23:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:52:42 +0000 (23:52 -0800)
* jc/name:
sha1_name: make core.warnambiguousrefs the default.
sha1_name: warning ambiguous refs.

1  2 
blame.c patch | diff1 | diff2 | blob | history
ls-tree.c patch | diff1 | diff2 | blob | history
diff --cc blame.c
Simple merge
diff --cc ls-tree.c
Simple merge