1. 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
  2. 28 May, 2015 1 commit
  3. 04 May, 2015 4 commits
  4. 06 Apr, 2015 1 commit
    • Fix git_checkout_tree() to do index filemodes correctly on Windows. · 67db2bde
      git_checkout_tree() has some fallback behaviors for file systems
      which don't have full support of filemodes.  Generally works fine,
      but if a given file had a change of type from a 0644 to 0755 (i.e.,
      you add executable permissions), the fallback behavior incorrectly
      triggers when writing hte updated index.
      
      This would cause a git_checkout_tree() command, even with the
      GIT_CHECKOUT_FORCE option set, to leave a dirty index on Windows.
      
      Also added checks to an existing test to catch this case.
      John Fultz committed
  5. 03 Mar, 2015 4 commits
  6. 27 Feb, 2015 3 commits
  7. 14 Feb, 2015 1 commit
  8. 04 Feb, 2015 1 commit
  9. 03 Feb, 2015 1 commit
  10. 20 Jan, 2015 1 commit
  11. 04 Jan, 2015 1 commit
  12. 23 Dec, 2014 2 commits
  13. 23 Nov, 2014 1 commit
  14. 06 Nov, 2014 1 commit
  15. 03 Aug, 2014 1 commit
  16. 06 Mar, 2014 1 commit
  17. 03 Feb, 2014 1 commit
  18. 30 Jan, 2014 2 commits
  19. 25 Jan, 2014 1 commit
  20. 22 Jan, 2014 1 commit
  21. 15 Jan, 2014 1 commit
  22. 13 Dec, 2013 2 commits
  23. 11 Dec, 2013 2 commits
  24. 14 Nov, 2013 1 commit
  25. 16 Oct, 2013 1 commit
  26. 07 Aug, 2013 1 commit
  27. 24 Jun, 2013 1 commit
  28. 21 Jun, 2013 1 commit