Junio C Hamano <gitster@xxxxxxxxx> writes: > Brad King <brad.king@xxxxxxxxxxx> writes: > >> The option added by commit ebdc94f3 (revision: --ancestry-path, >> 2010-04-20) does not work properly in combination with --all, at least >> in the case of a criss-cross merge: >> >> b---bc >> / \ / >> a X >> \ / \ >> c---cb > > Hmm, what should --ancestry-path do given more than one positive commit to > begin with, let alone --all? I actually think that this does not have much to do with "criss-cross"-ness. Instead of computing those that can be reached from cb, we are computing those that can be reached from either b, c or cb. This needs fixing, but it takes a bit more than a quick hack. Stay tuned ;-) Thanks. -- 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