summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-03 16:10:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-03 16:10:35 -0800
commit63ae595c6d60ac238e8a785bd811db41de74e93d (patch)
tree06a8969c011b95bea88ee34ccae75b1c5ff6dda0 /Documentation
parentMerge branch 'jj/icase-directory' (diff)
parentcore.abbrevguard: Ensure short object names stay unique a bit longer (diff)
downloadtgif-63ae595c6d60ac238e8a785bd811db41de74e93d.tar.xz
Merge branch 'jc/abbrev-guard'
* jc/abbrev-guard: core.abbrevguard: Ensure short object names stay unique a bit longer
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6b7279f883..ad5eb5f21d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -374,6 +374,15 @@ 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,