Commits · 16604d74697cff526b0fc1cd2b03bedd56641059 · lvzhengyang / git2 · GitLab

16 Mar, 2015 1 commit
- Renamed git_merge_options 'flags' to 'tree_flags' · f29dde68
  Jacques Germishuys committed 9 years ago
  
  f29dde68 Browse File
20 Mar, 2014 3 commits
- Remove `git_merge_result` as it's now unnecessary · d9fdee6e
  Edward Thomson committed 10 years ago
  
  d9fdee6e Browse File
- Update git_merge_tree_opts to git_merge_options · 5aa2ac6d
  Edward Thomson committed 10 years ago
  
  5aa2ac6d Browse File
- Change signature of `git_merge` to take merge and checkout opts · 02105a27
  Edward Thomson committed 10 years ago
  
  02105a27 Browse File
05 Feb, 2014 1 commit
- Prevent user's merge.conflictstyle from breaking tests · a2ce19ca
  Ben Straub committed 11 years ago
  
  a2ce19ca Browse File
14 Nov, 2013 1 commit
- Rename tests-clar to tests · 17820381
  Ben Straub committed 11 years ago
  
  17820381 Browse File
05 Nov, 2013 1 commit
- merge branch into current, updating workdir · 039db728
  Edward Thomson committed 11 years ago
  
  039db728 Browse Directory