1. 21 Apr, 2011 1 commit
    • index: Add API for unmerged entries · 4c0b6a6d
      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
      Jakob Pfender committed
  2. 15 Apr, 2011 3 commits
  3. 12 Apr, 2011 1 commit
  4. 10 Apr, 2011 3 commits
  5. 09 Apr, 2011 8 commits
  6. 08 Apr, 2011 12 commits
  7. 04 Apr, 2011 5 commits
  8. 03 Apr, 2011 1 commit
  9. 02 Apr, 2011 4 commits
  10. 31 Mar, 2011 1 commit
  11. 30 Mar, 2011 1 commit