diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-07-14 20:14:29 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-07-14 20:14:29 +0200 |
| commit | 17a172920fde8c6688c8a1a39f258629b8b73757 (patch) | |
| tree | 97735a11812af8acc54415101649b9a8ee18cd12 /lib/git/index/base.py | |
| parent | 24740f22c59c3bcafa7b2c1f2ec997e4e14f3615 (diff) | |
| download | gitpython-17a172920fde8c6688c8a1a39f258629b8b73757.tar.gz | |
Fixed the missing Repo type documentation thanks to a hint of gasche, fixed a few more resT syntax errors on the way
Diffstat (limited to 'lib/git/index/base.py')
| -rw-r--r-- | lib/git/index/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/index/base.py b/lib/git/index/base.py index 5011a932..386926c5 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -445,12 +445,12 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): def unmerged_blobs(self): """ - Returns + :return: Iterator yielding dict(path : list( tuple( stage, Blob, ...))), being a dictionary associating a path in the index with a list containing sorted stage/blob pairs - Note: + :note: Blobs that have been removed in one side simply do not exist in the given stage. I.e. a file removed on the 'other' branch whose entries are at stage 3 will not have a stage 3 entry. |