Patrick Steinhardt 367084e3c1 Implement merging of index entries. ...

This allows us to generate a textual diff of conflicting files in
bare repositories by performing a merge on the index followed by
repo.merge_file_from_index on the resulting index entries.

2015-03-11 16:08:13 +01:00

..

data

Add Repository.expand_id()

2015-02-06 01:17:19 +01:00

__init__.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_archive.py

Get ready for 0.21.3 release

2014-09-15 12:39:27 +02:00

test_blame.py

Move blame to cffi

2014-08-31 22:35:32 +02:00

test_blob.py

Blob: implement the memory buffer interface

2014-04-23 12:35:17 +02:00

test_branch.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_cherrypick.py

Add support for cherrypick()

2015-02-13 12:52:03 +00:00

test_commit.py

pypy3 does not have the AttributeError/TypeError difference

2014-09-06 19:38:16 +02:00

test_config.py

config: only return the config key in iteration

2014-07-24 18:43:54 +02:00

test_credentials.py

authenticate using ssh agent

2014-09-15 18:14:20 +01:00

test_diff.py

New DiffLine

2015-02-12 16:56:34 +01:00

test_index.py

Merge remote-tracking branch 'upstream/master' into development

2014-06-07 21:38:07 +02:00

test_merge.py

Introduce Repository.merge_trees()

2015-02-09 21:21:28 +01:00

test_note.py

Get rid of allocfmt()

2014-11-09 12:10:45 +01:00

test_object.py

object: allow passing a type object to peel()

2014-02-11 18:30:47 +01:00

test_oid.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_options.py

Create proxy object for libgit2 options

2014-03-23 15:53:32 +01:00

test_refs.py

Reference: implement peel()

2014-10-07 20:27:01 +02:00

test_remote.py

Remote: generalize push()

2015-01-12 18:39:21 +01:00

test_repository.py

Implement merging of index entries.

2015-03-11 16:08:13 +01:00

test_revwalk.py

walk: make the sorting mode optional

2014-02-06 10:46:30 +01:00

test_signature.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_status.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_tag.py

pypy3 does not have the AttributeError/TypeError difference

2014-09-06 19:38:16 +02:00

test_tree.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_treebuilder.py

Update copyright year

2014-02-04 08:02:12 +01:00

utils.py

Update copyright year

2014-02-04 08:02:12 +01:00