"Martin Langhoff" <martin.langhoff@gmail.com> writes: > I agree here with Pasky that after a while the automated > renames/copy/splitup detection will miss the operation in cases where > it would be interesting to note it to the user. IIRC git-rerere is the > tool that knows about this (still voodoo to me how) and could be used > to help here. At what (runtime) cost, I don't know, but that kind of > walking history to tell me more interesting things about the diff is > something that is usually worthwhile. FYI rerere is a totally unrelated voodoo. It remembers the conflict marker pattern <<< === >>> immediately after it runs "merge" (ah, that reminds me -- I should replace them with diff3), and then remembers the result of the manual resolution just before the user makes a commit. Then, when next time it runs "merge" for something and notices <<< === >>> pattern it has seen before, it runs a three-way merge between the previous resolution result and the current conflicted state, using the previous conflicted state as the common origin. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat May 06 17:14:43 2006
This archive was generated by hypermail 2.1.8 : 2006-05-06 17:15:01 EST