Merge branch 'maint'
commitadfe4e1ff2c296184856bf55636be845f96b55e5
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:45:49 +0000 (10 22:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:45:49 +0000 (10 22:45 -0800)
treeca672bed6ea60d2b3fdc9454f75b03e52472063c
parent83c3c6222a2331042c973a991572eafa37f25d1d
parentea2c69ed4728070be1d2ee953a6948398b859150
Merge branch 'maint'

* maint:
  Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
Documentation/config.txt
cache.h
config.c