I am very sorry that I did not spot this earlier, but 1.6.4-rc2 has a quite serious bug in "git apply --whitespace=fix" (hence "git am" with the same option) in that it can lose all the added empty lines when it detects any trailing spaces. I've sent a fix out already, and am planning to issue 1.6.4-rc3 this weekend, but in the meantime, please do not use it, nor any version that contains commit 735c674 (Trailing whitespace and no newline fix, 2009-07-22). Unfortunately the commit is included in all recent integration branches down to 'maint'. I'll push out the fixes for them soonish. Sorry for the trouble. -- 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