summaryrefslogtreecommitdiff
path: root/src/commit.c
diff options
context:
space:
mode:
authorJakob Pfender <jpfender@elegosoft.com>2011-04-21 10:54:54 +0200
committerJakob Pfender <jpfender@elegosoft.com>2011-04-21 10:54:54 +0200
commit4c0b6a6dac97f82da927720adb2e0bc285e0c2f1 (patch)
tree1ef213ef4e88ff27b3f4d0bb12e5e809725fe621 /src/commit.c
parentfee4c4255004c1f142e39d6884a4804eb38e3183 (diff)
downloadlibgit2-4c0b6a6dac97f82da927720adb2e0bc285e0c2f1.tar.gz
index: Add API for unmerged entries
New external functions: - git_index_unmerged_entrycount: Counts the unmerged entries in the index - git_index_get_unmerged: Gets an unmerged entry from the index by name New internal functions: - read_unmerged: Wrapper for read_unmerged_internal - read_unmerged_internal: Reads unmerged entries from the index if the index has the INDEX_EXT_UNMERGED_SIG set - unmerged_srch: Search function for unmerged vector - unmerged_cmp: Compare function for unmerged vector New data structures: - git_index now contains a git_vector unmerged that stores unmerged entries - git_index_entry_unmerged: Representation of an unmerged file entry. It represents all three versions of the file at the same time, with one name, three modes and three OIDs
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions