summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-10 22:45:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-10 22:45:49 -0800
commitadfe4e1ff2c296184856bf55636be845f96b55e5 (patch)
treeca672bed6ea60d2b3fdc9454f75b03e52472063c /Documentation
parentUpdate Release Notes to 1.7.5 (diff)
parentRevert "core.abbrevguard: Ensure short object names stay unique a bit longer" (diff)
downloadtgif-adfe4e1ff2c296184856bf55636be845f96b55e5.tar.xz
Merge branch 'maint'
* maint: Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c995a1a47b..701fba92dc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -376,15 +376,6 @@ core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
and might match multiple refs in the .git/refs/ tree. True by default.
-core.abbrevguard::
- Even though git makes sure that it uses enough hexdigits to show
- an abbreviated object name unambiguously, as more objects are
- added to the repository over time, a short name that used to be
- unique will stop being unique. Git uses this many extra hexdigits
- that are more than necessary to make the object name currently
- unique, in the hope that its output will stay unique a bit longer.
- Defaults to 0.
-
core.compression::
An integer -1..9, indicating a default compression level.
-1 is the zlib default. 0 means no compression,