openstack/deb-python-pygit2
Code Issues Proposed changes

implementing merge: some small fixes in merge.rst

Browse Source
This commit is contained in:
Victor Garcia
2013-12-09 15:51:29 +01:00
parent 7d9d2667e5
commit 1cf6e748e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/merge.rst
View File

@@ -28,11 +28,11 @@ Example::
The MergeResult object The MergeResult object
====================== ======================
Represents the result of a merge and contains this fields: Represents the result of a merge and contains these fields:
- is_uptodate: bool, if there wasn't any merge because the repo was already - is_uptodate: bool, if there wasn't any merge because the repo was already
up to date up to date
- is_fastforward: bool, whether the merge was fastforward or not - is_fastforward: bool, whether the merge was fastforward or not
- fastforward_oid: Oid, in the case it was a fastforward, this is the - fastforward_oid: Oid, in the case it was a fastforward, this is the
forwarded Oid. forwarded Oid.
- index: represents the repository index after the merge - index: represents the repository index after the merge