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
This commit is contained in:
W. Trevor King
2014-10-26 16:36:34 -07:00
parent b8efdde626
commit 120fdedb5a

View File

@@ -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 user to resolve if there are. Once there are no conflicts left, you
can create a commit with these two parents. can create a commit with these two parents.
>>> user = repo.default_signature() >>> user = repo.default_signature
>>> tree = repo.index.write_tree() >>> tree = repo.index.write_tree()
>>> new_commit = repo.create_commit('HEAD', user, user, tree, >>> new_commit = repo.create_commit('HEAD', user, user, tree,
[repo.head.target, other_branch_tip]) [repo.head.target, other_branch_tip])