From: Junio C Hamano <gitster@pobox.com>
To: Andrew Ardill <andrew.ardill@gmail.com>
Cc: Philip Oakley <philipoakley@iee.org>,
Chris Rorvick <chris@rorvick.com>, Git List <git@vger.kernel.org>,
Tomas Carnecky <tomas.carnecky@gmail.com>,
Woody Wu <narkewoody@gmail.com>
Subject: Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage
Date: Mon, 17 Dec 2012 17:53:20 -0800 [thread overview]
Message-ID: <7vvcc0i0rz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vobhsjq6a.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 17 Dec 2012 13:59:25 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> I agree with you that sightseeing use case where you do not intend
> to make any commit is also important. That is exactly why I said
> "further work is done on that branch" not "to that branch" in the
> message you are responding to.
Here is a work-in-progress relative to Chris's 83c9989
(Documentation/git-checkout.txt: document 70c9ac2 behavior,
2012-12-17).
Even though "switch to that specific branch" may be easy to grasp as
a concept, I do not think "switch to detached HEAD" makes much
sense, so I ended up with "switch" for the <branch> case, and
"detach" for the "--detach" one, at least for now.
diff --git c/Documentation/git-checkout.txt w/Documentation/git-checkout.txt
index db89cf7..dcf1a32 100644
--- c/Documentation/git-checkout.txt
+++ w/Documentation/git-checkout.txt
@@ -21,10 +21,12 @@ or the specified tree. If no paths are given, 'git checkout' will
also update `HEAD` to set the specified branch as the current
branch.
-'git checkout' [<branch>]::
-
- Update the index, working tree, and HEAD to reflect the
- specified branch.
+'git checkout' <branch>::
+ To prepare for working on <branch>, switch to it by updating
+ the index and the files in the working tree, and by pointing
+ HEAD at the branch. Local modifications to the files in the
+ working tree are kept, so that they can be committed to the
+ <branch>.
+
If <branch> is not found but there does exist a tracking branch in
exactly one remote (call it <remote>) with a matching name, treat as
@@ -33,6 +35,11 @@ equivalent to
------------
$ git checkout -b <branch> --track <remote>/<branch>
------------
++
+You could omit <branch>, in which case the command degenerates to
+"check out the current branch", which is a glorified no-op with a
+rather expensive side-effects to show only the tracking information,
+if exists, for the current branch.
'git checkout' -b|-B <new_branch> [<start point>]::
@@ -54,12 +61,17 @@ $ git checkout <branch>
that is to say, the branch is not reset/created unless "git checkout" is
successful.
-'git checkout' [--detach] [<commit>]::
+'git checkout' --detach [<commit>]::
+'git checkout' <commit>::
- Update the index and working tree to reflect the specified
- commit and set HEAD to point directly to <commit> (see
- "DETACHED HEAD" section.) Passing `--detach` forces this
- behavior even if <commit> is a branch.
+ Prepare to work on top of <commit>, by detaching HEAD at it
+ (see "DETACHED HEAD" section), and updating the index and the
+ files in the working tree. Local modifications to the files
+ in the working tree are kept, so that the resulting working
+ tree will be the state recorded in the commit plus the local
+ modifications.
++
+Passing `--detach` forces this behavior even if <commit> is a branch.
'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>...::
next prev parent reply other threads:[~2012-12-18 1:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 6:45 [PATCH 0/2] Documentation: clarify usage of checkout Chris Rorvick
2012-12-17 6:45 ` [PATCH 1/2] Documentation/git-checkout.txt: clarify usage Chris Rorvick
2012-12-17 7:21 ` Junio C Hamano
2012-12-17 8:20 ` Johannes Sixt
2012-12-17 8:48 ` Junio C Hamano
2012-12-17 8:59 ` Johannes Sixt
2012-12-17 19:12 ` Junio C Hamano
2012-12-17 8:53 ` Andrew Ardill
2012-12-18 2:55 ` Chris Rorvick
2012-12-17 20:51 ` Philip Oakley
2012-12-17 21:13 ` Junio C Hamano
2012-12-17 21:50 ` Andrew Ardill
2012-12-17 21:59 ` Junio C Hamano
2012-12-18 1:29 ` Andrew Ardill
2012-12-18 1:53 ` Junio C Hamano [this message]
2012-12-18 2:12 ` Andrew Ardill
2012-12-18 3:33 ` Chris Rorvick
2012-12-18 16:43 ` Junio C Hamano
2012-12-17 22:40 ` Philip Oakley
2012-12-17 6:45 ` [PATCH 2/2] Documentation/git-checkout.txt: document 70c9ac2 behavior Chris Rorvick
2012-12-17 7:21 ` Junio C Hamano
2012-12-17 7:23 ` Andrew Ardill
2012-12-17 7:26 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvcc0i0rz.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=andrew.ardill@gmail.com \
--cc=chris@rorvick.com \
--cc=git@vger.kernel.org \
--cc=narkewoody@gmail.com \
--cc=philipoakley@iee.org \
--cc=tomas.carnecky@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).