Merge branch 'jc/abbrev-guard' into next
commitf26c943b2db0d823c79e271d9eb154bd2934ee99
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:35 +0000 (24 16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:35 +0000 (24 16:00 -0800)
tree2f6475c317bcf9a750190a6e061f076072d4453f
parent683230605ff048f2ca8130d10a38986f0b4cd812
parent72a5b561fc1c4286bc7c5b0693afc076af261e1f
Merge branch 'jc/abbrev-guard' into next

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