Do not require clean tree when reverting and cherry-picking.
[git/git.git] /
2005-09-27 Junio C HamanoFix overzealous cleanliness check in git-merge
2005-09-25 Fredrik Kuivinen[PATCH] More descriptive messages for conflict cases...
2005-09-14 Junio C HamanoMerge branch 'master' of .
2005-09-13 Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
2005-09-13 Junio C HamanoFix off-by-one error in git-merge
2005-09-11 Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11 Junio C HamanoMulti-backend merge driver.