Merge branch 'jc/abbrev-guard'
commit63ae595c6d60ac238e8a785bd811db41de74e93d
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)
tree06a8969c011b95bea88ee34ccae75b1c5ff6dda0
parent5e738ae820ec53c45895b029baa3a1f63e654b1b
parent72a5b561fc1c4286bc7c5b0693afc076af261e1f
Merge branch 'jc/abbrev-guard'

* jc/abbrev-guard:
  core.abbrevguard: Ensure short object names stay unique a bit longer
Documentation/config.txt
cache.h
config.c
sha1_name.c