- 13 Jul, 2018 1 commit
-
-
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
-
- 10 Jun, 2018 1 commit
-
-
Patrick Steinhardt committed
-
- 14 Feb, 2015 1 commit
-
-
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
-
- 13 Feb, 2015 1 commit
-
-
Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.
Edward Thomson committed
-
- 27 Oct, 2014 1 commit
-
-
Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson committed
-
- 31 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 20 Mar, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 25 Jan, 2014 1 commit
-
-
Following the rest of the series, use 'id' when refering to the value.
Carlos Martín Nieto committed
-
- 14 Nov, 2013 1 commit
-
-
Ben Straub committed
-
- 13 Nov, 2013 1 commit
-
-
Russell Belfer committed
-
- 05 Nov, 2013 2 commits
-
-
nulltoken committed
-
Edward Thomson committed
-
- 17 May, 2013 1 commit
-
-
Edward Thomson committed
-
- 30 Apr, 2013 1 commit
-
-
Edward Thomson committed
-
- 04 Jan, 2013 2 commits
-
-
Vicent Marti committed
-
Edward Thomson committed
-
- 03 Jan, 2013 1 commit
-
-
Edward Thomson committed
-