summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-03 12:32:51 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-03 12:32:51 -0700
commitbe57695d77c4303798796510585618c57e1bba63 (patch)
tree820d05e7347393aeed8365e37cb62ec4ada5836d /environment.c
parent3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (diff)
parenta71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff)
downloadgit-be57695d77c4303798796510585618c57e1bba63.tar.gz
Merge branch 'lt/default-abbrev' into maint
* lt/default-abbrev: Rename core.abbrevlength back to core.abbrev Make the default abbrev length configurable
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index c3efbb9608..33c806421e 100644
--- a/environment.c
+++ b/environment.c
@@ -15,6 +15,7 @@ int user_ident_explicitly_given;
int trust_executable_bit = 1;
int trust_ctime = 1;
int has_symlinks = 1;
+int minimum_abbrev = 4, default_abbrev = 7;
int ignore_case;
int assume_unchanged;
int prefer_symlink_refs;