1. 11 Feb, 2016 1 commit
  2. 08 Feb, 2016 1 commit
  3. 16 Dec, 2015 1 commit
    • merge: Use `git_index__fill` to populate the index · 879ebab3
      Instead of calling `git_index_add` in a loop, use the new
      `git_index_fill` internal API to fill the index with the initial staged
      entries.
      
      The new `fill` helper assumes that all the entries will be unique and
      valid, so it can append them at the end of the entries vector and only
      sort it once at the end. It performs no validation checks.
      
      This prevents the quadratic behavior caused by having to sort the
      entries list once after every insertion.
      Vicent Marti committed
  4. 25 Nov, 2015 8 commits
  5. 02 Nov, 2015 3 commits
  6. 28 Oct, 2015 3 commits
  7. 27 Oct, 2015 2 commits
  8. 22 Oct, 2015 1 commit
  9. 05 Oct, 2015 2 commits
  10. 30 Aug, 2015 2 commits
  11. 28 Aug, 2015 2 commits
  12. 12 Jul, 2015 1 commit
  13. 25 Jun, 2015 1 commit
  14. 10 Jun, 2015 1 commit
  15. 29 May, 2015 1 commit
    • Rename GIT_EMERGECONFLICT to GIT_ECONFLICT · 885b94aa
      We do not error on "merge conflicts"; on the contrary, merge conflicts
      are a normal part of merging.  We only error on "checkout conflicts",
      where a change exists in the index or the working directory that would
      otherwise be overwritten by performing the checkout.
      
      This *may* happen during merge (after the production of the new index
      that we're going to checkout) but it could happen during any checkout.
      Edward Thomson committed
  16. 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
  17. 11 May, 2015 1 commit
  18. 16 Mar, 2015 4 commits
  19. 14 Feb, 2015 2 commits
  20. 13 Feb, 2015 2 commits