From a71f09fe3e8b047d88b5f439c6d552e8fc7e8293 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 20 Mar 2011 22:26:24 -0700 Subject: [PATCH] Rename core.abbrevlength back to core.abbrev It corresponds to --abbrev=$n command line option after all. Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 30afde98ae..dacbcdeb79 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 e8a6e56795..79e6c1896e 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;