Hi Jonathan, Disclaimer: I'm sorry if I sound incredibly stupid. I know nothing about how the diffing algorithm works. Jonathan Nieder writes: > Ramkumar Ramachandra wrote: >> Hm, I was actually thinking of a much less ambitious helper that would >> kick in when the heuristic correlation between two files is above a >> certain threshold. > > Doesn't that already work? For example: > > git cherry-pick -Xrename-threshold=50 foo Okay, I'm still trying to figure out what this does. It's supposed to "influence the rename detection" according to the 1.7.4 release notes. I tried: $ git cherry-pick -Xrename-threshold=90 sequencer~1 [test 7400609] sequencer: Expose API to cherry-picking machinery 3 files changed, 256 insertions(+), 1247 deletions(-) rewrite builtin/revert.c (81%) rename builtin/revert.c => sequencer.c (81%) Is it supposed to influence the diffstat? I don't see any conflict markers in sequencer.c. I can see lots of unintelligent (and useless) conflict markers in builtin/revert.c. What am I supposed to be looking at? -- Ram -- 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