Steven Grimm wrote: > > Signed-off-by: Steven Grimm <koreth@xxxxxxxxxxxxx> > --- > Okay, let's try this again with an MUA that won't change my tabs to > spaces -- sorry about that. > > A couple of source files got checked into my code base with DOS-style > end-of-line characters. I converted them to UNIX-style (the convention > for this project) in my branch. Then later, I renamed a couple of them. > > Meanwhile, back in the original branch, someone else fixed a bug in one > of the files and checked it in, still with DOS-style line endings. > > When I merged that change into my branch, git didn't detect the rename > because the fact that every line has a change (the end-of-line > character) dropped the similarity score way too low. > > This patch teaches git to ignore end-of-line style when looking for > potential rename candidates. A separate question, which I expect may be > more controversial, is what to do with conflict markers; with this > patch, the entire file is still marked as in conflict if the end-of-line > style changes (but it's still an improvement in that we at least detect > the rename now.) I think that nobody would object to have a use-case description like this in the commit message... -- Hannes - 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
