>> "Updates the files in the working tree that are different between >> <commit> and HEAD, but keeps those which are different between the >> index and working tree, and finally resets the index." > > There is nothing to update as long as the index is not reset. Well then I simply don't understand what --merge does. Is it like --keep but instead of failing when a file-to-be-overwritten has changes it simply ignores the overwriting and continues? Philippe -- 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