summaryrefslogtreecommitdiff
path: root/lib/git/cmd.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/cmd.py
parent6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff)
parentc3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff)
downloadgitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz
Merge branch 'docs'
Diffstat (limited to 'lib/git/cmd.py')
-rw-r--r--lib/git/cmd.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/git/cmd.py b/lib/git/cmd.py
index d0f2a19e..cd848e05 100644
--- a/lib/git/cmd.py
+++ b/lib/git/cmd.py
@@ -5,8 +5,8 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os, sys
-from utils import *
-from errors import GitCommandError
+from util import *
+from exc import GitCommandError
from subprocess import (
call,
@@ -272,7 +272,7 @@ class Git(object):
This merely is a workaround as data will be copied from the
output pipe to the given output stream directly.
- :param **subprocess_kwargs:
+ :param subprocess_kwargs:
Keyword arguments to be passed to subprocess.Popen. Please note that
some of the valid kwargs are already set by this method, the ones you
specify may not be the same ones.