By the way, that merges without conflicts with Adam's series, but it will not compile as he renamed functions that I'm now using (path_excluded() -> is_path_excluded() that is). By the way, Junio, how do you handle this situation as a maintainer ? Do you keep a note to manually make the change every time you remerge the series together ? That is the kind of use-case you can't handle with git-rerere, and I've been trying to find a solution to it. -- 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