| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | treewide: remove use of C++ style comments | Patrick Steinhardt | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
| * | merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` | Edward Thomson | 2015-11-25 | 1 | -3/+3 |
| | | |||||
| * | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 1 | -3/+3 |
| | | |||||
| * | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -11/+3 |
| | | |||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -3/+3 |
| | | |||||
| * | Change signature of `git_merge` to take merge and checkout opts | Edward Thomson | 2014-03-20 | 1 | -13/+14 |
| | | |||||
| * | Prevent user's merge.conflictstyle from breaking tests | Ben Straub | 2014-02-05 | 1 | -0/+7 |
| | | |||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+156 |
