From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Junio C Hamano <gitster@pobox.com>,
"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 19:24:30 +0200 [thread overview]
Message-ID: <vpqh9q6gsdt.fsf@anie.imag.fr> (raw)
In-Reply-To: <5581A3A3.1070908@web.de> ("Torsten \=\?iso-8859-1\?Q\?B\=F6gersha\?\= \=\?iso-8859-1\?Q\?usen\=22's\?\= message of "Wed, 17 Jun 2015 18:43:15 +0200")
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.
(Ironically, Junio did almost the same remark when I proposed to
document "git describe" as "Describe ...", but the word "describe" does
not have the ambiguity problem that "checkout" has)
> 'git checkout <commit> -- <path>'
> will "copy" the version from another commit into the workspace.
If <commit> exists, it means that the state of this path existed
somewhere in <path> in the past (well, modulo "git add -p" and other
ways to cheat with history).
So, to me, "restore a previous version" does apply in this case. Perhaps
"restore a recorded state into the worktree" (my favorite up to now I
think).
But as you say, it copies into the workspace, so "copy a previous
version into the workspace" sounds good to me.
Basically, I'm fine with anything starting with "Switch branches or",
but please do change the headline ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-06-17 17:24 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 [this message]
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=vpqh9q6gsdt.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=knocte@gmail.com \
--cc=tboegi@web.de \
/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.