diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-07-03 01:00:45 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-11-05 10:00:39 -0500 |
| commit | 039db728f3a0477129e664f0fd8c08316a9e8b62 (patch) | |
| tree | ef86e21bc11aec3fe2a8c860a169c84ab7ccc875 /src/merge.h | |
| parent | ae26c4b80f6d144df0e7915f72c64c5daf73ca50 (diff) | |
| download | libgit2-039db728f3a0477129e664f0fd8c08316a9e8b62.tar.gz | |
merge branch into current, updating workdir
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index 0ecad6e3e..d7d1c67b7 100644 --- a/src/merge.h +++ b/src/merge.h @@ -114,9 +114,20 @@ struct git_merge_head { char *remote_url; git_oid oid; + char oid_str[GIT_OID_HEXSZ+1]; git_commit *commit; }; +/** Internal structure for merge results */ +struct git_merge_result { + bool is_uptodate; + + bool is_fastforward; + git_oid fastforward_oid; + + git_index *index; +}; + int git_merge__bases_many( git_commit_list **out, git_revwalk *walk, |