Junio C Hamano <[EMAIL PROTECTED]> writes: > Sam Ravnborg <[EMAIL PROTECTED]> writes: > >> But --soft, --hard looks rather confusing to me. >> >> Something like --force or --prune may be a bit more intuitive, and let >> default behaviour be the one you name --soft for now. > > I do not have objections to removing --mixed, but I do not find > --force/--prune any less confusing than --soft/--hard. Its just > a terminology so once people get used to it anything would do. > But I agree that we need to come up with a good name for them. > I do not think --force/--prune is it, though.
Names aside, I have a feeling that "git reset --hard HEAD" is what "git checkout -f HEAD" should have done. As it stands, the latter leaves files not in HEAD but in the previous tree behind. Comments? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html