Merge branch 'lt/default-abbrev' into maint
commitbe57695d77c4303798796510585618c57e1bba63
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:51 +0000 (3 12:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:51 +0000 (3 12:32 -0700)
tree820d05e7347393aeed8365e37cb62ec4ada5836d
parent3967c995eed9f4046a1dde5ef520d1dbcdedfab8
parenta71f09fe3e8b047d88b5f439c6d552e8fc7e8293
Merge branch 'lt/default-abbrev' into maint

* lt/default-abbrev:
  Rename core.abbrevlength back to core.abbrev
  Make the default abbrev length configurable
Documentation/config.txt
builtin/describe.c
cache.h
config.c
environment.c