Google Git
Sign in
googlers / jrn / git / 050e3349792d182ba1fd1ba25135c99103d15ade / git-merge-resolve.sh
  1. 24ba8b7 merge-resolve: abort if index does not match HEAD by Elijah Newren · 2 years, 8 months ago
  2. 974ce80 scripts: use "git foo" not "git-foo" by Michael Forney · 8 years ago
  3. 7bd93c1 Convert to use quiet option when available by Dan Loewenherz · 16 years ago
  4. 7d3c82a Fixing comment in merge strategies by Tom Clarke · 18 years ago
  5. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  6. 3dff537 Assorted typo fixes by Pavel Roskin · 18 years ago
  7. 1b1fdf8 read-tree --aggressive by Junio C Hamano · 19 years ago
  8. 88f8f0a [PATCH] Enable and fix support for base less merges. by Fredrik Kuivinen · 19 years ago
  9. 2276aa6 Use Daniel's read-tree in the merge strategy 'resolve'. by Junio C Hamano · 20 years ago
  10. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago