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

..

__init__.py

Expose the pygit2.GIT_REPOSITORY_INIT_* constants

2015-02-01 10:53:19 +01:00

_utils.py

Merge remote-tracking branch 'Sheeo/master'

2015-01-19 13:56:32 +01:00

blame.py

Get back iter(Blame)

2015-02-12 13:02:04 +01:00

config.py

Get back iter(Blame)

2015-02-12 13:02:04 +01:00

credentials.py

Make it explicit what to do when no passphrase is needed

2015-01-12 18:20:07 -08:00

decl.h

Implement merging of index entries.

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

errors.py

Show at least git error code when no git error message is available

2015-02-20 11:35:10 +01:00

ffi.py

Fix (again) the chicken-and-egg problem with cffi

2014-10-30 17:59:38 +01:00

index.py

Get back iter(Blame)

2015-02-12 13:02:04 +01:00

py2.py

Fix syntax error

2014-08-12 11:25:17 +02:00

py3.py

Fix regression in v0.21.1, IndexEntry.path returns str

2014-07-28 18:02:24 +02:00

refspec.py

Note that Refspec constructor is internal. Fix typo.

2015-01-12 18:23:03 -08:00

remote.py

Safer handling of string arrays

2015-02-06 03:51:05 +01:00

repository.py

Implement merging of index entries.

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

settings.py

Cleanup a little bit the code

2014-07-14 20:21:24 +03:00

utils.py

Get back iter(Blame)

2015-02-12 13:02:04 +01:00