From: Junio C Hamano <gitster@pobox.com>
To: Chris Rorvick <chris@rorvick.com>
Cc: Andrew Ardill <andrew.ardill@gmail.com>,
Philip Oakley <philipoakley@iee.org>,
Git List <git@vger.kernel.org>,
Tomas Carnecky <tomas.carnecky@gmail.com>,
Woody Wu <narkewoody@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage
Date: Tue, 18 Dec 2012 08:43:38 -0800 [thread overview]
Message-ID: <7vvcbzgvk5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAEUsAPa1XMeymEXbLu=iy8VTdLO=iPUeVN3QPH+FbQecL8XnsA@mail.gmail.com> (Chris Rorvick's message of "Mon, 17 Dec 2012 21:33:09 -0600")
Chris Rorvick <chris@rorvick.com> writes:
> I like Johannes' suggestion of using "<branch>" in the --detach case
> instead of "<commit>" as I think it makes the reason for the
> separation more obvious at a glance.
Sounds sensible; even though the option does not require its
argument to be a branch name, the user does not have a reason to use
the option if it is not giving a branch name, either, so it all
balances out ;-).
>
> --->8---
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> index dcf1a32..4fdf41a 100644
> --- a/Documentation/git-checkout.txt
> +++ b/Documentation/git-checkout.txt
> @@ -61,8 +61,8 @@ $ git checkout <branch>
> that is to say, the branch is not reset/created unless "git checkout" is
> successful.
>
> -'git checkout' --detach [<commit>]::
> 'git checkout' <commit>::
> +'git checkout' --detach [<branch>]::
>
> Prepare to work on top of <commit>, by detaching HEAD at it
> (see "DETACHED HEAD" section), and updating the index and the
> @@ -71,7 +71,8 @@ successful.
> tree will be the state recorded in the commit plus the local
> modifications.
> +
> -Passing `--detach` forces this behavior even if <commit> is a branch.
> +Passing `--detach` forces this behavior in the case of a <branch>, or
> +the current branch if one is not specified.
>
> 'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>...::
next prev parent reply other threads:[~2012-12-18 16:43 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
2012-12-18 2:12 ` Andrew Ardill
2012-12-18 3:33 ` Chris Rorvick
2012-12-18 16:43 ` Junio C Hamano [this message]
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=7vvcbzgvk5.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=andrew.ardill@gmail.com \
--cc=chris@rorvick.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--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).