On Fri, May 23, 2008 at 05:02:11PM -0700, Junio C Hamano wrote: > These days, rerere is pretty much automatic in that rerere is called > automatically from places that generate conflicts (e.g. "git merge") for > purpose of (1), and from places that the user tells git that the conflicts > are now resolved (e.g. "git commit") for purpose of (2). Note that it is not totally automatic for most people because the default is to enable only if the .git/rr_cache directory exists, and neither git init nor git clone create this directory. You still have to set rerere.enabled yourself. Mike -- 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