2011/3/29 Nguyán ThÃi Ngác Duy <pclouds@xxxxxxxxx>: > Also make it clear how --hard and --merge are different. By the way I don't like the option names --hard, --mixed and --soft. They do not remind me what they actually do. Every time I need to do non-default operation, I have to open man page. I've been thinking of --ref, --index and --worktree as a more friendly version, which can be combined and converted to --soft, --mixed and --hard internally. Invalid combinations will be rejected. That thinking went well until I found out there were --merge and --keep, and was stuck. -- Duy -- 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