Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > Add a "renormalize" parameter to ll_merge so callers can decide on a > case-by-case basis whether the merge is likely to have overlapped with > a change in smudge/clean rules. This reveals a few commands that have > not been taking that situation into account, though it does not fix > them. > > No change in behavior intended. Looking nice so far; I however think a separate "renormalize" parameter should be folded into "flag" word, perhaps with a few new macros to make it easier to access renormalize, virtual-ancestor, and favor-side parts 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