2010/2/9 Junio C Hamano <gitster@xxxxxxxxx>: > I actually changed my mind after thinking about it a bit more. Thanks for thinking more about it and for your explanation about the algorithm I am quite busy at the moment, but I hope to get started on a patch series after the end of February. > I'd like to see this logic (and only this logic, without relying on the > diff hunk offset numbers at all) done first, because it is very much in > line with what we already do, and more importantly, because it is a more > general solution that is applicable outside the context of rebase. I'll try to implement that logic. It seems that it should cover 99% of all real-world use cases. I will not worry about the general case (tons of blanks) until I have got the first patch working. -- Björn Gustavsson, Erlang/OTP, Ericsson AB -- 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