summaryrefslogtreecommitdiff
path: root/git/objects/tree.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-05-05 15:25:11 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-05-05 15:25:11 +0200
commit9fc7b9a068189cc0d249d0870dfb0112ab5dec92 (patch)
tree3e185c8d5028abd4dda32c14744a771f4da088e0 /git/objects/tree.py
parent3fe1a7f87d511758adf2e56803cb3610b80c5f08 (diff)
downloadgitpython-9fc7b9a068189cc0d249d0870dfb0112ab5dec92.tar.gz
Made most primal imports work, but stopped here as there are many more changes when doing the merge
Diffstat (limited to 'git/objects/tree.py')
-rw-r--r--git/objects/tree.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 23e1dfe4..00ef07fc 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -4,9 +4,11 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
from git.util import RepoAliasMixin
-from gitdb.object.tree import GitDB_Tree, TreeModifier
+from gitdb.object.tree import Tree as GitDB_Tree
+from gitdb.object.tree import TreeModifier
import git.diff as diff
+from blob import Blob
from submodule.base import Submodule
__all__ = ("TreeModifier", "Tree")