diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
commit | fd96cceded27d1372bdc1a851448d2d8613f60f3 (patch) | |
tree | 5b53f288a3379e260f46a65d08691fceec4a0ca3 /lib/git/objects/commit.py | |
parent | 6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff) | |
parent | c3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff) | |
download | gitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz |
Merge branch 'docs'
Diffstat (limited to 'lib/git/objects/commit.py')
-rw-r--r-- | lib/git/objects/commit.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/git/objects/commit.py b/lib/git/objects/commit.py index f88bb0e8..132d794b 100644 --- a/lib/git/objects/commit.py +++ b/lib/git/objects/commit.py @@ -4,7 +4,7 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -from git.utils import ( +from git.util import ( Iterable, Stats, ) @@ -17,7 +17,7 @@ import base from gitdb.util import ( hex_to_bin ) -from utils import ( +from util import ( Traversable, Serializable, get_user_id, @@ -182,11 +182,11 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): def iter_parents(self, paths='', **kwargs): """Iterate _all_ parents of this commit. + :param paths: Optional path or list of paths limiting the Commits to those that contain at least one of the paths :param kwargs: All arguments allowed by git-rev-list - :return: Iterator yielding Commit objects which are parents of self """ # skip ourselves skip = kwargs.get("skip", 1) |