Junio C Hamano <gitster@xxxxxxxxx> writes: > The work tree is overwritten by the result of the > merge when this combining is done cleanly, and the result is > committed. Otherwise it is > overwritten by a half-merged results when this combining results I thought of something like this, but this is slightly incorrect in case of fast-forward (Git doesn't "commit", but "reuses" a commit), so I prefered making a separate paragraph. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html