From 120fdedb5a9dabb51e65bb531a606a1e3b9758f3 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 26 Oct 2014 16:36:34 -0700 Subject: [PATCH] docs/merge: default_signature is an attribute, not a method Avoid: >>> repo.default_signature() Traceback (most recent call last): File "", line 1, in TypeError: '_pygit2.Signature' object is not callable --- docs/merge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/merge.rst b/docs/merge.rst index 413f034..c29277d 100644 --- a/docs/merge.rst +++ b/docs/merge.rst @@ -29,7 +29,7 @@ You can now inspect the index file for conflicts and get back to the user to resolve if there are. Once there are no conflicts left, you can create a commit with these two parents. - >>> user = repo.default_signature() + >>> user = repo.default_signature >>> tree = repo.index.write_tree() >>> new_commit = repo.create_commit('HEAD', user, user, tree, [repo.head.target, other_branch_tip])