diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
commit | be57695d77c4303798796510585618c57e1bba63 (patch) | |
tree | 820d05e7347393aeed8365e37cb62ec4ada5836d /Documentation | |
parent | 3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (diff) | |
parent | a71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff) | |
download | git-be57695d77c4303798796510585618c57e1bba63.tar.gz |
Merge branch 'lt/default-abbrev' into maint
* 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.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1a571f4174..52ffbf4efb 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 |