>> * Split in a separate commit to help git keep track of moved files. > > Huh? Never had any issues with that. The way got tracks moved file is "this one was removed, this other one was added with the same contents, must be a move". It usually gets it right when there are some changes to the file in the same commit, but not always. -- Adrien.