diff options
| -rw-r--r-- | git/index/base.py | 2 | ||||
| -rw-r--r-- | git/test/test_repo.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git/index/base.py b/git/index/base.py index 753fa4ae..f80eb290 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -838,7 +838,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): :param kwargs: Additional keyword arguments to be passed to git-rm, such - as 'r' to allow recurive removal of + as 'r' to allow recursive removal of :return: List(path_string, ...) list of repository relative paths that have diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 2e44f0aa..db3ee62b 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -767,7 +767,7 @@ class TestRepo(TestBase): for kw in ('a', 'all'): res = repo.merge_base(c1, c2, c3, **{kw: True}) assert isinstance(res, list) and len(res) == 1 - # end for eaech keyword signalling all merge-bases to be returned + # end for each keyword signalling all merge-bases to be returned # Test for no merge base - can't do as we have self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff') |