11 Commits

Author SHA1 Message Date
Richard Möhn
654e4bf56f Cherry-pick recipe: clean up after picking
In b3025e3fe I had written that when following my recipe, the repository
remains in cherry-picking mode afterwards. In issue #516 I was told that
Repository.state_cleanup() is needed to correct that. Therefore add it
to the recipe.

Also add a note near the documentation for cherry-pick, so that nobody
will overlook this again. Apparently there are other times when you need
to do Repository.state_cleanup() as well, but it's not documented, I
don't know when and I don't want to take the time and find out. So leave
it at that for now.
2015-04-25 14:49:48 +09:00
J. David Ibáñez
fbb11775a3 Update changelog 2015-02-14 21:27:34 +01:00
Carlos Martín Nieto
d4da228c0e Add documentation for merge_commits() and merge_trees() 2015-02-09 21:25:33 +01:00
W. Trevor King
120fdedb5a docs/merge: default_signature is an attribute, not a method
Avoid:

  >>> repo.default_signature()
  Traceback (most recent call last):
    File "<stdin>", line 1, in <module>
  TypeError: '_pygit2.Signature' object is not callable
2014-10-26 16:36:34 -07:00
Carlos Martín Nieto
9a7348a9d0 Update docs for merging
Remove references to MergeResult and put merge_analysis in the docs.
2014-07-08 13:55:18 +02:00
Carlos Martín Nieto
e5f6798f67 Adjust to oid -> id renaming 2014-04-01 19:47:48 +02:00
Carlos Martín Nieto
1cc112c32f docs: adjust to recent changes
It seems I have been forgetting to update the documentation with the
last few  changes, so adjust to the oid -> id renaming and add missing
attributes to the listings.
2014-01-25 04:25:42 +01:00
Victor Garcia
1938147b3d implementing merge: removing index field from merge.rst 2013-12-10 16:02:37 +01:00
Victor Garcia
1cf6e748e5 implementing merge: some small fixes in merge.rst 2013-12-09 15:51:29 +01:00
Victor Garcia
7d9d2667e5 implementing merge: merge.rst doc and implementing MergeResult as a simple type that maps git_merge_result to it 2013-12-09 15:40:39 +01:00
J. David Ibáñez
101715bf37 docs: review, in progress 2013-05-09 14:21:04 +02:00