path: root/
AgeCommit message (Expand)Author
2022-07-23merge-resolve: abort if index does not match HEADElijah Newren
2017-08-07scripts: use "git foo" not "git-foo"Michael Forney
2009-04-23Convert to use quiet option when availableDan Loewenherz
2007-08-31Fixing comment in merge strategiesTom Clarke
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-02-04Assorted typo fixesPavel Roskin
2006-02-07read-tree --aggressiveJunio C Hamano
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano