diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-21 18:40:35 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-21 18:40:35 +0200 |
| commit | d97afa24ad1ae453002357e5023f3a116f76fb17 (patch) | |
| tree | 6cfda2fd99649a49062d397dda5864ae9b24c3ba /lib/git/index.py | |
| parent | babf5765da3e328cc1060cb9b37fbdeb6fd58350 (diff) | |
| download | gitpython-d97afa24ad1ae453002357e5023f3a116f76fb17.tar.gz | |
Improved testing of index against trees, tests succeed with next commit
Diffstat (limited to 'lib/git/index.py')
| -rw-r--r-- | lib/git/index.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/index.py b/lib/git/index.py index 6b51c5c7..1042d7b8 100644 --- a/lib/git/index.py +++ b/lib/git/index.py @@ -288,7 +288,7 @@ class Index(object): If 1 Tree is given, it will just be read into a new index 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. + one. It behaves like a fast-forward. 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 |