openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'wking/default-signature-attribute'

Browse Source
This commit is contained in:
J. David Ibáñez
2014-10-27 13:20:10 +01:00
parent 149bb1e9e2 120fdedb5a
commit 54720c4f01
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/merge.rst
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])