Code

Merge branch 'lt/default-abbrev' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:51 +0000 (12:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:51 +0000 (12:32 -0700)
* lt/default-abbrev:
  Rename core.abbrevlength back to core.abbrev
  Make the default abbrev length configurable

1  2 
Documentation/config.txt
builtin/describe.c
cache.h
config.c
environment.c

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