Use phrases like "git object type" where applicable

In some recently introduced or expanded docstrings, I had overused
phrases like "kind of git object" with the hope of avoiding
confusion with the meanings of "type" relevant to Python (i.e.,
"class" or "static type"). But this made the relationship to git's
own notion of "object type" less clear than it could be, especially
in docstrings that also included links to the gitglossary(7) entry
for "object type" (because those links' relevance was less clear).

This dials back the use of "kind" to where I am more confident that
it is clarifying or at least not confusing.

Author: EliahKagan

git/objects/base.py

@@ -37,7 +37,7 @@
 
 
 class Object(LazyMixin):
-    """Base class for classes representing kinds of git objects.
+    """Base class for classes representing git object types.
 
     The following leaf classes represent specific kinds of git objects:
 
@@ -61,7 +61,7 @@ class Object(LazyMixin):
     :note:
         :class:`~git.objects.submodule.base.Submodule` is defined under the hierarchy
         rooted at this :class:`Object` class, even though submodules are not really a
-        kind of git object.
+        type of git object.
 
     """
 
@@ -78,7 +78,7 @@ class Object(LazyMixin):
     __slots__ = ("repo", "binsha", "size")
 
     type: Union[Lit_commit_ish, None] = None
-    """String identifying (a concrete :class:`Object` subtype for) a kind of git object.
+    """String identifying (a concrete :class:`Object` subtype for) a git object type.
 
     The subtypes that this may name correspond to the kinds of git objects that exist,
     i.e., the objects that may be present in a git repository.
@@ -87,7 +87,7 @@ class Object(LazyMixin):
         Most subclasses represent specific types of git objects and override this class
         attribute accordingly. This attribute is ``None`` in the :class:`Object` base
         class, as well as the :class:`IndexObject` intermediate subclass, but never
-        ``None`` in concrete leaf subclasses representing specific kinds of git objects.
+        ``None`` in concrete leaf subclasses representing specific git object types.
 
     :note:
         See also :class:`~git.types.Commit_ish`.
@@ -214,9 +214,10 @@ def stream_data(self, ostream: "OStream") -> "Object":
 class IndexObject(Object):
     """Base for all objects that can be part of the index file.
 
-    The classes representing kinds of git objects that can be part of the index file are
+    The classes representing git object types that can be part of the index file are
     :class:`~git.objects.tree.Tree and :class:`~git.objects.blob.Blob`. In addition,
-    :class:`~git.objects.submodule.base.Submodule` is also a subclass.
+    :class:`~git.objects.submodule.base.Submodule`, which is not really a git object
+    type but can be part of an index file, is also a subclass.
     """
 
     __slots__ = ("path", "mode")

git/types.py

@@ -67,9 +67,9 @@
 """
 
 Commit_ish = Union["Commit", "TagObject", "Blob", "Tree"]
-"""Union of the :class:`~git.objects.base.Object`-based types that represent kinds of
-git objects. This union is often usable where a commit-ish is expected, but is not
-actually limited to types representing commit-ish git objects.
+"""Union of the :class:`~git.objects.base.Object`-based types that represent git object
+types. This union is often usable where a commit-ish is expected, but is not actually
+limited to types representing commit-ish git objects.
 
 See gitglossary(7) on:
 
@@ -93,7 +93,7 @@
 
 Lit_commit_ish = Literal["commit", "tag", "blob", "tree"]
 """Literal strings identifying concrete :class:`~git.objects.base.Object` subtypes
-representing kinds of git objects.
+representing git object types.
 
 See the :class:`Object.type <git.objects.base.Object.type>` attribute.