1. 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
  2. 03 Mar, 2015 1 commit
    • Remove the signature from ref-modifying functions · 659cf202
      The signature for the reflog is not something which changes
      dynamically. Almost all uses will be NULL, since we want for the
      repository's default identity to be used, making it noise.
      
      In order to allow for changing the identity, we instead provide
      git_repository_set_ident() and git_repository_ident() which allow a user
      to override the choice of signature.
      Carlos Martín Nieto committed
  3. 27 Oct, 2014 1 commit
  4. 20 Mar, 2014 2 commits
  5. 06 Mar, 2014 1 commit
  6. 25 Jan, 2014 1 commit
  7. 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
  8. 15 Jan, 2014 1 commit
  9. 14 Nov, 2013 1 commit
  10. 10 Nov, 2013 1 commit
  11. 05 Nov, 2013 1 commit