diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
| commit | fd96cceded27d1372bdc1a851448d2d8613f60f3 (patch) | |
| tree | 5b53f288a3379e260f46a65d08691fceec4a0ca3 /lib/git/index/typ.py | |
| parent | 6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff) | |
| parent | c3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff) | |
| download | gitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz | |
Merge branch 'docs'
Diffstat (limited to 'lib/git/index/typ.py')
| -rw-r--r-- | lib/git/index/typ.py | 14 |
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 |