From: Junio C Hamano <gitster@pobox•com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Cc: "Torsten Bögershausen" <tboegi@web•de>,
"Andres G. Aragoneses" <knocte@gmail•com>,
git@vger•kernel.org
Subject: Re: [PATCH v2] git-checkout.txt: Document "git checkout <pathspec>" better
Date: Wed, 17 Jun 2015 12:23:19 -0700 [thread overview]
Message-ID: <xmqqpp4u6swo.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpqh9q6gsdt.fsf@anie.imag.fr> (Matthieu Moy's message of "Wed, 17 Jun 2015 19:24:30 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp•fr> writes:
> Torsten Bögershausen <tboegi@web•de> writes:
>
>> My v3 will probably use the original line:
>> git-checkout - Checkout a branch or paths to the working tree
>
> I think mentionning "Switch branch" was a real improvement. For someone
> not familiar with the version control vocabulary, "checkout" does not
> mean much (just looked in a dictionary, it talks about payment and
> leaving a room in a hotel ...). And someone not understanding what
> "checkout" means in this context won't be helped much reading the
> description and getting "checkout" there.
Or, borrow a book from a library, which I think is the closest
analogy for this operation. But you are right. It is suboptimal to
explain "checkout" in terms of "checkout" ;-).
> But as you say, it copies into the workspace, so "copy a previous
> version into the workspace" sounds good to me.
I am afraid that "previous" would lead to "Ah, you mean HEAD~1?"
confusion. In any case, you cannot copy what hasn't yet been
created, "previous" is superfluous.
I think "restore" also by definition has to go back to _some_
existing version, not a future yet-to-be-created one, so "restore to
some previous state" is superfluous; in that sense, I find that
"restore working tree files" may still be the one that makes most
sense, at least to me, among the phrases floated in this thread so
far.
> Basically, I'm fine with anything starting with "Switch branches or",
> but please do change the headline ;-).
Likewise; I agree "switch branches or" part is good.
next prev parent reply other threads:[~2015-06-17 19:23 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
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 [this message]
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=xmqqpp4u6swo.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=knocte@gmail$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox