Carlos Martín Nieto 2b5e408029 Merge remote-tracking branch 'upstream/master' into development ...

Reconcile the changes between the ffi changes upstream with the changes
to libgit2 in the dev branch.

Conflicts:
	src/config.c
	src/options.c
	src/refspec.c
	src/remote.c

2014-05-16 04:41:26 +02:00

..

_static

Use autodocs

2013-01-12 18:42:12 +01:00

recipes

docs: clarify git-init recipe

2014-02-11 22:07:05 +01:00

blame.rst

docs: fix warnings

2014-02-04 07:52:58 +01:00

conf.py

Get ready to release 0.20.3

2014-04-02 22:28:18 +02:00

config.rst

Fix config documentation keyword

2014-04-18 12:17:54 +02:00

diff.rst

Adjust to oid -> id renaming

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

general.rst

docs: review, in progress

2013-05-09 14:21:04 +02:00

index.rst

Drop official support for Python 2.6

2014-04-23 14:01:09 +02:00

install.rst

Drop official support for Python 2.6

2014-04-23 14:01:09 +02:00

log.rst

Add documentation for the Walker type

2013-12-23 17:26:02 +01:00

Makefile

sphinx-quickstart

2013-01-06 09:57:03 +01:00

merge.rst

Adjust to oid -> id renaming

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

objects.rst

Adjust to oid -> id renaming

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

oid.rst

docs: fix warnings

2014-02-04 07:52:58 +01:00

recipes.rst

restructured recipes

2013-07-05 20:14:33 -04:00

references.rst

Adjust to oid -> id renaming

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

remotes.rst

Remote: add documentation strings

2014-04-14 11:42:51 +02:00

repository.rst

docs: adjust to recent changes

2014-01-25 04:25:42 +01:00

revparse.rst

docs: complete and improve organization

2013-04-03 19:09:48 +02:00

settings.rst

Settings: add documentation

2014-03-24 01:44:36 +01:00

working-copy.rst

Adjust to oid -> id renaming

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