Carlos Martín Nieto fcd4b9446b Introduce Repository.merge_trees() ...

This is the function which does the work for Repository.merge_commits()
and allows us more direct control over which trees we want to merge,
including trees which do not belong to commits.

2015-02-09 21:21:28 +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 ready for 0.21.3 release

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

config.py

internal: split code for Python 2/3 compatibility

2014-07-28 17:51:51 +02:00

credentials.py

Make it explicit what to do when no passphrase is needed

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

decl.h

Introduce Repository.merge_trees()

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

errors.py

Cleanup a little bit the code

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

ffi.py

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

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

index.py

Safer handling of string arrays

2015-02-06 03:51:05 +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

Introduce Repository.merge_trees()

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

settings.py

Cleanup a little bit the code

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

utils.py

Safer handling of string arrays

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