On 2015-06-17 17.29, Junio C Hamano wrote: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > >> Yes, but "Switch branchs or discard local changes" still does not >> describe "git checkout HEAD^^^ -- file.txt" (restore to an old state, >> but does not switch branch) or "git checkout -- file.txt" (get from the >> index). > > You are right, especially when file.txt does not have any change > relative to HEAD, there is no "discarding" going on. You are > actively introducing a change to an unchanged file by checking > contents out of a different revision. > >> To me, "discard local changes" imply that there will be no uncommited >> changes on the files implied in the command after the operation. > > Yup. Thanks for the comments. I agree that we should keep the headline as is. What is about the the rest of the patch? Does it makes sense ? -- 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