Merge remote-tracking branch 'rmoehn/cherry-pick-cleanup'

docs/merge.rst

@@ -40,6 +40,10 @@ Cherrypick
 
 .. automethod:: pygit2.Repository.cherrypick
 
+Note that after a successful cherrypick you have to run
+:py:meth:`.Repository.state_cleanup` in order to get the repository out
+of cherrypicking mode.
+
 
 Lower-level methods
 ===================

docs/recipes/git-cherry-pick.rst

@@ -30,6 +30,8 @@ working copy and on-disk index.
                            cherry.message, tree_id, [basket.target])
         del basket # outdated, prevent from accidentally using it
 
+        repo.state_cleanup()
+
 
 ----------------------------------------------------------------------
 Cherry-picking a commit without a working copy