1. 29 Jun, 2015 1 commit
  2. 26 Jun, 2015 1 commit
  3. 25 Jun, 2015 3 commits
  4. 23 Jun, 2015 1 commit
  5. 20 Jun, 2015 1 commit
  6. 02 Jun, 2015 1 commit
  7. 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
  8. 13 May, 2015 1 commit
  9. 11 May, 2015 7 commits
  10. 03 Mar, 2015 2 commits
  11. 18 Feb, 2015 1 commit
  12. 03 Oct, 2014 1 commit
  13. 24 Sep, 2014 1 commit
  14. 18 Aug, 2014 1 commit
  15. 01 Jul, 2014 1 commit
  16. 23 Apr, 2014 1 commit
    • Make checkout match diff for untracked/ignored dir · 37da3685
      When diff finds an untracked directory, it emulates Git behavior
      by looking inside the directory to see if there are any untracked
      items inside it. If there are only ignored items inside the dir,
      then diff considers it ignored, even if there is no direct ignore
      rule for it.
      
      Checkout was not copying this behavior - when it found an untracked
      directory, it just treated it as untracked.  Unfortunately, when
      combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that
      checkout (and stash, which uses checkout) was removing ignored
      items when you had only asked it to remove untracked ones.
      
      This commit moves the logic for advancing past an untracked dir
      while scanning for non-ignored items into an iterator helper fn,
      and uses that for both diff and checkout.
      Russell Belfer committed
  17. 22 Apr, 2014 2 commits
  18. 25 Mar, 2014 1 commit
    • Make submodules externally refcounted · a15c7802
      `git_submodule` objects were already refcounted internally in case
      the submodule name was different from the path at which it was
      stored.  This makes that refcounting externally used as well, so
      `git_submodule_lookup` and `git_submodule_add_setup` return an
      object that requires a `git_submodule_free` when done.
      Russell Belfer committed
  19. 04 Mar, 2014 1 commit
  20. 05 Feb, 2014 1 commit
  21. 15 Jan, 2014 1 commit
  22. 14 Nov, 2013 1 commit