Did you run the tests after applying this patch? This looks like it would break: t/t7110-reset-merge.sh 176: grep file1 err.log | grep "not uptodate" 192: grep file1 err.log | grep "not uptodate" -- 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