summaryrefslogtreecommitdiff
path: root/lib/git/index/typ.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-29 18:28:31 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-29 18:28:31 +0200
commit160081b9a7ca191afbec077c4bf970cfd9070d2c (patch)
tree5e47a446919fbdd5f7a9a82b6944dc2f1b32bdba /lib/git/index/typ.py
parent6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff)
downloadgitpython-160081b9a7ca191afbec077c4bf970cfd9070d2c.tar.gz
Updated and fixed sphinx API docs, which included one quick skim-through
Diffstat (limited to 'lib/git/index/typ.py')
-rw-r--r--lib/git/index/typ.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/git/index/typ.py b/lib/git/index/typ.py
index 7654b402..3a01cd65 100644
--- a/lib/git/index/typ.py
+++ b/lib/git/index/typ.py
@@ -78,10 +78,10 @@ class BaseIndexEntry(tuple):
def stage(self):
"""Stage of the entry, either:
- 0 = default stage
- 1 = stage before a merge or common ancestor entry in case of a 3 way merge
- 2 = stage of entries from the 'left' side of the merge
- 3 = stage of entries from the right side of the merge
+ * 0 = default stage
+ * 1 = stage before a merge or common ancestor entry in case of a 3 way merge
+ * 2 = stage of entries from the 'left' side of the merge
+ * 3 = stage of entries from the right side of the merge
:note: For more information, see http://www.kernel.org/pub/software/scm/git/docs/git-read-tree.html
"""
@@ -112,10 +112,10 @@ class IndexEntry(BaseIndexEntry):
See the properties for a mapping between names and tuple indices. """
@property
def ctime(self):
- """:return:
- Tuple(int_time_seconds_since_epoch, int_nano_seconds) of the
- file's creation time
"""
+ :return:
+ Tuple(int_time_seconds_since_epoch, int_nano_seconds) of the
+ file's creation time"""
return unpack(">LL", self[4])
@property