From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Pitre <nico@fluxnic.net>
Cc: Jay Soffian <jaysoffian@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] git-checkout.txt: improve detached HEAD documentation
Date: Thu, 17 Feb 2011 16:25:38 -0800 [thread overview]
Message-ID: <7vmxlu89z1.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.2.00.1102171909412.14920@xanadu.home> (Nicolas Pitre's message of "Thu\, 17 Feb 2011 19\:14\:25 -0500 \(EST\)")
Nicolas Pitre <nico@fluxnic.net> writes:
> On Thu, 17 Feb 2011, Junio C Hamano wrote:
> ...
>> You can rectify it by tagging 'c' as a release point and detaching the
>> HEAD at that tag without losing the clarity of the following description.
>> While doing so, it would be better to update the labels in the
>> illustration with s/master/master branch/ and s/[abcde]/commit &/ as well,
>> e.g.
>>
>>
>> HEAD (refers to branch 'master')
>> |
>> V
>> a---b---c---d branch 'master' (refers to commit 'd')
>> ^
>> |
>> tag 'v2.0' (refers to commit 'c')
>
> While I agree with the above, I think this is still a good idea to keep
> this example using a non-tagged commit as well. Perhaps not the first
> one as you say.
Just to make sure, I wasn't opposed to the idea of showing the history
after building a few commits on top of the point you started from, to
explain why you might want to re-attach the about-to-be-orphaned commits
to the DAG anchored by refs.
IOW, detach at v2.0 tag, experiment with a few commits to fix things up,
and then when things go well, make it a maitenance branch, or something.
next prev parent reply other threads:[~2011-02-18 0:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 19:46 [PATCH] git-checkout.txt: improve detached HEAD documentation Jay Soffian
2011-02-17 19:48 ` Jay Soffian
2011-02-17 20:47 ` Nicolas Pitre
2011-02-17 21:49 ` Junio C Hamano
2011-02-18 0:14 ` Nicolas Pitre
2011-02-18 0:25 ` Junio C Hamano [this message]
2011-02-20 5:21 ` Jay Soffian
2011-02-22 5:56 ` Junio C Hamano
2011-02-22 15:19 ` Jay Soffian
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=7vmxlu89z1.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=nico@fluxnic.net \
/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.