Junio C Hamano wrote: > Pong, if you are pinging me. I thought you wanted to only discuss it > first with RFC and meant to follow up on a real-for-inclusion patch. You thought correctly. In this case I can't think of any change this needs on top to make this real for inclusion so I just bumped the thread. There were two hints at improvements in this thread (separate topic): the "git merge" manual could use some discussion of the distinction between --renormalize and --ignore-whitespace-at-eol, and am, rebase, stash, and "checkout -m <tree>" ought to have -X plumbed, too. -- 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