From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: "Andres G. Aragoneses" <knocte@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] git-checkout.txt: Document "git checkout <pathspec>" better
Date: Wed, 17 Jun 2015 14:17:40 +0200 [thread overview]
Message-ID: <vpqtwu6sf4r.fsf@anie.imag.fr> (raw)
In-Reply-To: <mlrn9r$9ho$1@ger.gmane.org> (Andres G. Aragoneses's message of "Wed, 17 Jun 2015 13:56:43 +0200")
"Andres G. Aragoneses" <knocte@gmail.com> writes:
> On 17/06/15 13:54, Matthieu Moy wrote:
>> "Andres G. Aragoneses" <knocte@gmail.com> writes:
>>
>>> On 17/06/15 12:54, Matthieu Moy wrote:
>>>> Duy Nguyen <pclouds@gmail.com> writes:
>>>>
>>>>> On Wed, Jun 17, 2015 at 2:54 PM, Torsten Bögershausen <tboegi@web.de> 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/
next prev parent reply other threads:[~2015-06-17 12:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 7:54 [PATCH v2] git-checkout.txt: Document "git checkout <pathspec>" better Torsten Bögershausen
2015-06-17 9:58 ` Duy Nguyen
2015-06-17 10:54 ` Matthieu Moy
2015-06-17 11:47 ` Andres G. Aragoneses
2015-06-17 11:54 ` Matthieu Moy
2015-06-17 11:56 ` Andres G. Aragoneses
2015-06-17 12:17 ` Matthieu Moy [this message]
2015-06-17 15:29 ` Junio C Hamano
2015-06-17 16:12 ` Torsten Bögershausen
2015-06-17 16:19 ` Junio C Hamano
2015-06-17 16:43 ` Torsten Bögershausen
2015-06-17 17:24 ` Matthieu Moy
2015-06-17 17:53 ` Andres G. Aragoneses
2015-06-17 19:24 ` Junio C Hamano
2015-06-17 19:23 ` Junio C Hamano
2015-06-17 19:29 ` Torsten Bögershausen
2015-06-17 19:58 ` Junio C Hamano
2015-06-18 0:37 ` Duy Nguyen
2015-06-18 1:07 ` Junio C Hamano
2015-06-18 7:00 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqtwu6sf4r.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=knocte@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.