summaryrefslogtreecommitdiff
path: root/git/repo/fun.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-22 16:28:29 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-22 16:28:29 +0100
commit5ad07f7b23e762e3eb99ce45020375d2bd743fc5 (patch)
tree08ad8249d4f59c7579fd6458d7b51aafc9c094e6 /git/repo/fun.py
parent2ce3fe7cef8910aadc2a2b39a3dab4242a751380 (diff)
parent1410bcc76725b50be794b385006dedd96bebf0fb (diff)
downloadgitpython-5ad07f7b23e762e3eb99ce45020375d2bd743fc5.tar.gz
Merge branch 'master' into teeberg-master
Need latest master to proceed with test Conflicts: doc/source/tutorial.rst
Diffstat (limited to 'git/repo/fun.py')
-rw-r--r--git/repo/fun.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/git/repo/fun.py b/git/repo/fun.py
index 2321dbc8..1d551f04 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -148,8 +148,6 @@ def rev_parse(repo, rev):
:param rev: git-rev-parse compatible revision specification as string, please see
http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html
for details
- :note: Currently there is no access to the rev-log, rev-specs may only contain
- topological tokens such ~ and ^.
:raise BadObject: if the given revision could not be found
:raise ValueError: If rev couldn't be parsed
:raise IndexError: If invalid reflog index is specified"""