Carlos Martín Nieto bc8b29b4f3 Repository: allow passing a favor option to merge_commits ...

I've gone with taking a string and converting it because the depth of
the namespacing in the libgit2 name is rather large and we don't care
about the global namespace that C has; and this also lets us pass the
same as the '-X' option to git-merge.

2014-10-30 16:21:22 +01:00

..

data

implementing merge with default options

2013-12-04 18:23:13 +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_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

Adjust to oid -> id renaming

2014-04-01 19:47:48 +02:00

test_index.py

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

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

test_merge.py

Repository: allow passing a favor option to merge_commits

2014-10-30 16:21:22 +01:00

test_note.py

Adjust to oid -> id renaming

2014-04-01 19:47:48 +02: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

Provide method for deleting a remote

2014-09-04 15:57:05 +02:00

test_repository.py

Repository: make head read-only and introduce set_head()

2014-09-04 01:58:05 +02: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