summaryrefslogtreecommitdiff
path: root/index
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-11-24 19:48:59 +0100
committerSebastian Thiel <byronimo@gmail.com>2010-11-24 19:48:59 +0100
commit3175b5b21194bcc8f4448abe0a03a98d3a4a1360 (patch)
treef1a098c4b38ae3b7cf52600e9fc9c357cdd7c353 /index
parentfca367548e365f93c58c47dea45507025269f59a (diff)
parent3203cd7629345d32806f470a308975076b2b4686 (diff)
downloadgitpython-3175b5b21194bcc8f4448abe0a03a98d3a4a1360.tar.gz
Merge branch 'reflog'
Diffstat (limited to 'index')
-rw-r--r--index/base.py2
-rw-r--r--index/fun.py7
2 files changed, 3 insertions, 6 deletions
diff --git a/index/base.py b/index/base.py
index 05caa06d..a63dbb26 100644
--- a/index/base.py
+++ b/index/base.py
@@ -3,8 +3,6 @@
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-"""Module containing Index implementation, allowing to perform all kinds of index
-manipulations such as querying and merging."""
import tempfile
import os
import sys
diff --git a/index/fun.py b/index/fun.py
index 87fdf1a9..9b35bf04 100644
--- a/index/fun.py
+++ b/index/fun.py
@@ -1,7 +1,6 @@
-"""
-Contains standalone functions to accompany the index implementation and make it
-more versatile
-"""
+# Contains standalone functions to accompany the index implementation and make it
+# more versatile
+# NOTE: Autodoc hates it if this is a docstring
from stat import (
S_IFDIR,
S_IFLNK,