summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-21 05:26:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-21 05:26:24 (GMT)
commita71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (patch)
tree323953033c31ee36776ee93bbd09441a00050942
parentdce96489162b05ae3463741f7f0365ff56f0de36 (diff)
downloadgit-a71f09fe3e8b047d88b5f439c6d552e8fc7e8293.zip
git-a71f09fe3e8b047d88b5f439c6d552e8fc7e8293.tar.gz
git-a71f09fe3e8b047d88b5f439c6d552e8fc7e8293.tar.bz2
Rename core.abbrevlength back to core.abbrev
It corresponds to --abbrev=$n command line option after all. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt2
-rw-r--r--config.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 30afde9..dacbcde 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -567,7 +567,7 @@ core.sparseCheckout::
Enable "sparse checkout" feature. See section "Sparse checkout" in
linkgit:git-read-tree[1] for more information.
-core.abbrevLength::
+core.abbrev::
Set the length object names are abbreviated to. If unspecified,
many commands abbreviate to 7 hexdigits, which may not be enough
for abbreviated object names to stay unique for sufficiently long
diff --git a/config.c b/config.c
index e8a6e56..79e6c18 100644
--- a/config.c
+++ b/config.c
@@ -531,7 +531,7 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
- if (!strcmp(var, "core.abbrevlength")) {
+ if (!strcmp(var, "core.abbrev")) {
int abbrev = git_config_int(var, value);
if (abbrev < minimum_abbrev || abbrev > 40)
return -1;