1. 25 Nov, 2015 12 commits
  2. 22 Oct, 2015 1 commit
  3. 05 Oct, 2015 2 commits
  4. 19 Sep, 2015 2 commits
  5. 28 Aug, 2015 1 commit
  6. 12 Jul, 2015 1 commit
  7. 07 Jul, 2015 1 commit
  8. 22 Jun, 2015 1 commit
  9. 16 Jun, 2015 1 commit
  10. 28 May, 2015 1 commit
    • introduce `git_index_entry_is_conflict` · 9f545b9d
      It's not always obvious the mapping between stage level and
      conflict-ness.  More importantly, this can lead otherwise sane
      people to write constructs like `if (!git_index_entry_stage(entry))`,
      which (while technically correct) is unreadable.
      
      Provide a nice method to help avoid such messy thinking.
      Edward Thomson committed
  11. 11 May, 2015 1 commit
  12. 16 Mar, 2015 3 commits
  13. 03 Mar, 2015 2 commits
  14. 14 Feb, 2015 1 commit
    • merge: lock the index at the start of the merge · 8b0ddd5d
      Always lock the index when we begin the merge, before we write
      any of the metdata files.  This prevents a race where another
      client may run a commit after we have written the MERGE_HEAD but
      before we have updated the index, which will produce a merge
      commit that is treesame to one parent.  The merge will finish and
      update the index and the resultant commit would not be a merge at
      all.
      Edward Thomson committed
  15. 13 Feb, 2015 1 commit
  16. 07 Dec, 2014 1 commit
  17. 27 Oct, 2014 1 commit
  18. 01 Oct, 2014 1 commit
  19. 26 Sep, 2014 1 commit
  20. 16 Sep, 2014 1 commit
  21. 03 Aug, 2014 1 commit
  22. 01 Jul, 2014 2 commits
  23. 28 May, 2014 1 commit