1. 13 Jul, 2018 1 commit
    • treewide: remove use of C++ style comments · 9994cd3f
      C++ style comment ("//") are not specified by the ISO C90 standard and
      thus do not conform to it. While libgit2 aims to conform to C90, we did
      not enforce it until now, which is why quite a lot of these
      non-conforming comments have snuck into our codebase. Do a tree-wide
      conversion of all C++ style comments to the supported C style comments
      to allow us enforcing strict C90 compliance in a later commit.
      Patrick Steinhardt committed
  2. 10 Jun, 2018 1 commit
  3. 04 Feb, 2018 3 commits
  4. 21 Jan, 2018 1 commit
    • merge: recursive uses larger conflict markers · 185b0d08
      Git uses longer conflict markers in the recursive merge base - two more
      than the default (thus, 9 character long conflict markers).  This allows
      users to tell the difference between the recursive merge conflicts and
      conflicts between the ours and theirs branches.
      
      This was introduced in git d694a17986a28bbc19e2a6c32404ca24572e400f.
      
      Update our tests to expect this as well.
      Edward Thomson committed
  5. 09 Feb, 2017 1 commit
  6. 01 Jan, 2017 1 commit
  7. 26 May, 2016 1 commit
  8. 25 Nov, 2015 11 commits
  9. 22 Oct, 2015 1 commit
  10. 28 Aug, 2015 1 commit
  11. 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
  12. 11 May, 2015 1 commit
  13. 16 Mar, 2015 3 commits
  14. 01 Oct, 2014 1 commit
  15. 01 Jul, 2014 1 commit
  16. 20 Mar, 2014 2 commits
  17. 25 Jan, 2014 1 commit
  18. 20 Jan, 2014 2 commits
    • Remove the "merge none" flag · 0e1ba46c
      The "merge none" (don't automerge) flag was only to aide in
      merge trivial tests.  We can easily determine whether merge
      trivial resulted in a trivial merge or an automerge by examining
      the REUC after automerge has completed.
      Edward Thomson committed
    • merge_file should use more aggressive levels · c1d648c5
      The default merge_file level was XDL_MERGE_MINIMAL, which will
      produce conflicts where there should not be in the case where
      both sides were changed identically.  Change the defaults to be
      more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
      compress non-conflicts.  This matches git.git's defaults.
      
      Increase testing around reverting a previously reverted commit to
      illustrate this problem.
      Edward Thomson committed
  19. 09 Dec, 2013 1 commit
  20. 03 Dec, 2013 1 commit
  21. 14 Nov, 2013 1 commit