1. 16 Jun, 2015 1 commit
  2. 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
  3. 11 May, 2015 1 commit
  4. 16 Mar, 2015 3 commits
  5. 03 Mar, 2015 2 commits
  6. 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
  7. 13 Feb, 2015 1 commit
  8. 07 Dec, 2014 1 commit
  9. 27 Oct, 2014 1 commit
  10. 01 Oct, 2014 1 commit
  11. 26 Sep, 2014 1 commit
  12. 16 Sep, 2014 1 commit
  13. 03 Aug, 2014 1 commit
  14. 01 Jul, 2014 2 commits
  15. 28 May, 2014 3 commits
  16. 23 Apr, 2014 2 commits
  17. 14 Apr, 2014 1 commit
  18. 31 Mar, 2014 1 commit
  19. 20 Mar, 2014 9 commits
  20. 06 Mar, 2014 1 commit
  21. 05 Feb, 2014 2 commits
  22. 04 Feb, 2014 3 commits