summaryrefslogtreecommitdiff
path: root/lib/git/__init__.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-07-01 17:58:19 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-07-01 17:58:19 +0200
commitfd96cceded27d1372bdc1a851448d2d8613f60f3 (patch)
tree5b53f288a3379e260f46a65d08691fceec4a0ca3 /lib/git/__init__.py
parent6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff)
parentc3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff)
downloadgitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz
Merge branch 'docs'
Diffstat (limited to 'lib/git/__init__.py')
-rw-r--r--lib/git/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/__init__.py b/lib/git/__init__.py
index 7860a3c1..5ebeaa7d 100644
--- a/lib/git/__init__.py
+++ b/lib/git/__init__.py
@@ -28,12 +28,12 @@ from git.config import GitConfigParser
from git.objects import *
from git.refs import *
from git.diff import *
-from git.errors import *
+from git.exc import *
from git.cmd import Git
from git.repo import Repo
from git.remote import *
from git.index import *
-from git.utils import (
+from git.util import (
LockFile,
BlockingLockFile,
Stats