summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 304faa76..5f42dd29 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -97,6 +97,7 @@ class Repo(object):
repo = Repo("/Users/mtrier/Development/git-python.git")
repo = Repo("~/Development/git-python.git")
repo = Repo("$REPOSITORIES/Development/git-python.git")
+ repo = Repo("C:\\Users\\mtrier\\Development\\git-python\\.git")
- In *Cygwin*, path may be a `'cygdrive/...'` prefixed path.
- If it evaluates to false, :envvar:`GIT_DIR` is used, and if this also evals to false,
@@ -558,11 +559,11 @@ class Repo(object):
return res
def is_ancestor(self, ancestor_rev, rev):
- """Check if a commit is an ancestor of another
+ """Check if a commit is an ancestor of another
:param ancestor_rev: Rev which should be an ancestor
:param rev: Rev to test against ancestor_rev
- :return: ``True``, ancestor_rev is an accestor to rev.
+ :return: ``True``, ancestor_rev is an ancestor to rev.
"""
try:
self.git.merge_base(ancestor_rev, rev, is_ancestor=True)