summaryrefslogtreecommitdiff
path: root/lib/git/index.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2009-11-03 21:43:17 +0100
committerSebastian Thiel <byronimo@gmail.com>2009-11-04 13:18:41 +0100
commit4748e813980e1316aa364e0830a4dc082ff86eb0 (patch)
tree65a00a4d9cbd47175b6d5a417923c3be2f4a4e84 /lib/git/index.py
parentf41d42ee7e264ce2fc32cea555e5f666fa1b1fe9 (diff)
downloadgitpython-4748e813980e1316aa364e0830a4dc082ff86eb0.tar.gz
added all new files to reference.rst and corrected the worst mistakes. There are still a few errors left that I cannot fix as it complains about whitespace in the end ... that is exactly what I hate restructured text for, its just a ... anyway.
Diffstat (limited to 'lib/git/index.py')
-rw-r--r--lib/git/index.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/git/index.py b/lib/git/index.py
index 705b1ae7..e368f531 100644
--- a/lib/git/index.py
+++ b/lib/git/index.py
@@ -44,11 +44,12 @@ class _TemporaryFileSwap(object):
class BaseIndexEntry(tuple):
"""
- Small Brother of an index entry which can be created to describe changes
+
+ Small Brother of an index entry which can be created to describe changes
done to the index in which case plenty of additional information is not requried.
- As the first 4 data members match exactly to the IndexEntry type, methods
- expecting a BaseIndexEntry can also handle full IndexEntries even if they
+ As the first 4 data members match exactly to the IndexEntry type, methods
+ expecting a BaseIndexEntry can also handle full IndexEntries even if they
use numeric indices for performance reasons.
"""
@@ -396,7 +397,7 @@ class IndexFile(LazyMixin, diff.Diffable):
If 2 Trees are given, they will be merged into a new index using a
two way merge algorithm. Tree 1 is the 'current' tree, tree 2 is the 'other'
one. It behaves like a fast-forward.
- If 3 Trees are given, a 3-way merge will be performed with the first tree
+ If 3 Trees are given, a 3-way merge will be performed with the first tree
being the common ancestor of tree 2 and tree 3. Tree 2 is the 'current' tree,
tree 3 is the 'other' one