Merge branch 'jc/abbrev-guard'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:10:35 +0000 (3 16:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:10:35 +0000 (3 16:10 -0800)
* jc/abbrev-guard:
  core.abbrevguard: Ensure short object names stay unique a bit longer

1  2 
Documentation/config.txt
cache.h
config.c
sha1_name.c

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