summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-23 21:55:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-23 21:55:40 (GMT)
commitda2584243e4308f10adeb45e95fb090c0110fe4f (patch)
tree0c32caa2ad160cee9703a5481536d037179e60f1 /Documentation
parent6fe519a91cc7131931ca50fedcdeb8e41453c892 (diff)
parenta71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff)
downloadgit-da2584243e4308f10adeb45e95fb090c0110fe4f.zip
git-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.gz
git-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.bz2
Merge branch 'lt/default-abbrev'
* lt/default-abbrev: Rename core.abbrevlength back to core.abbrev Make the default abbrev length configurable
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 701fba9..8ea55d4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -558,6 +558,12 @@ core.sparseCheckout::
Enable "sparse checkout" feature. See section "Sparse checkout" in
linkgit:git-read-tree[1] for more information.
+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
+ time.
+
add.ignore-errors::
add.ignoreErrors::
Tells 'git add' to continue adding files when some files cannot be