1. 14 Feb, 2015 1 commit
    • merge: lock the index at the start of the merge · 8b0ddd5d
      Always lock the index when we begin the merge, before we write
      any of the metdata files.  This prevents a race where another
      client may run a commit after we have written the MERGE_HEAD but
      before we have updated the index, which will produce a merge
      commit that is treesame to one parent.  The merge will finish and
      update the index and the resultant commit would not be a merge at
      all.
      Edward Thomson committed
  2. 13 Feb, 2015 1 commit
  3. 27 Oct, 2014 1 commit
  4. 31 Mar, 2014 1 commit
  5. 20 Mar, 2014 3 commits
  6. 25 Jan, 2014 1 commit
  7. 14 Nov, 2013 1 commit
  8. 13 Nov, 2013 1 commit
  9. 05 Nov, 2013 2 commits
  10. 17 May, 2013 1 commit
  11. 30 Apr, 2013 1 commit
  12. 04 Jan, 2013 2 commits
  13. 03 Jan, 2013 1 commit