aboutsummaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-23 14:55:40 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-23 14:55:40 -0700
commitda2584243e4308f10adeb45e95fb090c0110fe4f (patch)
tree0c32caa2ad160cee9703a5481536d037179e60f1 /environment.c
parent6fe519a91cc7131931ca50fedcdeb8e41453c892 (diff)
parenta71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff)
downloadgit-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.gz
git-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.xz
Merge branch 'lt/default-abbrev'
* 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 cc670b156..f4549d3f7 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;