"Andres G. Aragoneses" <[email protected]> writes: > On 17/06/15 13:54, Matthieu Moy wrote: >> "Andres G. Aragoneses" <[email protected]> writes: >> >>> On 17/06/15 12:54, Matthieu Moy wrote: >>>> Duy Nguyen <[email protected]> writes: >>>> >>>>> On Wed, Jun 17, 2015 at 2:54 PM, Torsten Bögershausen <[email protected]> >>>>> wrote: >>>>>> -git-checkout - Checkout a branch or paths to the working tree >>>>>> +git-checkout - Switch branches or restore changes >>>>> >>>>> I didn't follow closely the previous discussion. >>>> >>>> (Neither did I) >>>> >>>>> Forgive me if this is already discussed, but I would keep the "in the >>>>> working tree". "Restore changes" alone seems vague. >>>> >>>> "Restore previous version" would be better than "Restore changes" to me. >>> >>> "previous version" sounds ambiguous. >> >> Yes, but "git checkout" can do many things. It can restore an old >> commited state, restore from the index, ... so we need to either be >> vague, or use a long enumeration. >> >>> How about "discard local changes"? >> >> To me this describes "git checkout HEAD", but neither "git checkout -- >> file" nor "git checkout HEAD^^^". > > I didn't mean to use just "discard local changes". I was proposing > that as a replacement to the "restore changes" substring.
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). To me, "discard local changes" imply that there will be no uncommited changes on the files implied in the command after the operation. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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
