[PATCH 9/9] config doc: document core.disambiguate
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2018-04-30 22:08:15
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The core.disambiguate variable was added in
5b33cb1fd7 ("get_short_sha1: make default disambiguation
configurable", 2016-09-27) but never documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---
Documentation/config.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2659153cb3..6fee67c12d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -910,6 +910,20 @@ core.abbrev:: abbreviated object names to stay unique for some time. The minimum length is 4. +core.disambiguate:: + If Git is given a SHA-1 that's ambigous it'll suggest what + objects you might mean. By default it'll print out all + potential objects with that prefix regardless of their + type. This setting, along with the `^{<type>}` peel syntax + (see linkgit:gitrevisions[7]), allows for narrowing that down. + ++ +Is set to `none` by default, can also be `commit` (peel syntax: +`$sha1^{commit}`), `commitish` (commits and tags), `tree` (peel: +`$sha1^{tree}`), `treeish` (everything except blobs), `blob` (peel: +`$sha1^{blob}`) or `tag` (peel: `$sha1^{tag}`). The peel syntax will +override any config value. + add.ignoreErrors:: add.ignore-errors (deprecated):: Tells 'git add' to continue adding files when some files cannot be
--
2.17.0.290.gded63e768a