Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
DOC: minor typos
  • Loading branch information
yarikoptic committed Jan 8, 2016
commit a7b609c9f382685448193b59d09329b9a30c7580
2 changes: 1 addition & 1 deletion git/index/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ def remove(self, items, working_tree=False, **kwargs):

: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
Expand Down
2 changes: 1 addition & 1 deletion git/test/test_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ def test_merge_base(self):
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')
Expand Down