git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steve Diver <squelch2@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nicolas Pitre <nico@fluxnic.net>, Mark Lodato <lodatom@gmail.com>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	Git List <git@vger.kernel.org>, Ron1 <ron1@flownet.com>,
	Jacob Helwig <jacob.helwig@gmail.com>
Subject: Re: master^ is not a local branch -- huh?!?
Date: Mon, 1 Feb 2010 11:52:51 +0000	[thread overview]
Message-ID: <31a97741002010352x1ad27f26ia4d51857bb2d2d4f@mail.gmail.com> (raw)

On 30/01/2010 06:03, Junio C Hamano wrote:

>Nicolas Pitre <nico@fluxnic.net> writes:

>>First, I'm afraid that "Checking out commit 'foobar'" might be confusing
>>as this may happen through either a remote branch, a tag, or any random
>>commit.  It seems to me that "Checking out 'v2.5'" is less confusing

>>than "Checking out commit 'v2.5'".  But that's a minor detail and
>>probably a personal preference.
...
>>To the contrary: this "detached HEAD" is exactly what you need if you
>>want to relate to any documentation or perform a search for more

>>information.  Like it or not, this detached HEAD term is exactly what
>>this Git concept is all about and how it is designated everywhere.  The
>>sooner Git users see and learn about it the better.

>As I am not good at keeping track of different proposals to change this
>word here and that word there, I expect this will probably need at least
>few rotations of earth to get input from people in different timezones,

>and I think this is post 1.7.0 item anyway, I'll queue the attached draft
>in 'pu' and keep it there, to make it easier for others to tweak the
>message.


Would it be a safe assumption to describe a 'detached HEAD' state as
being synonymous with a (local) personal scratchpad or temporary
workspace based on and from the original committed object?

If this assumption is correct, then maybe this notion of a scratchpad
may be more intuitive and conceptual to new users without getting
bogged down with the necessary semantics of the terms used, but can
also preserve references to 'detached HEAD' in the documentation for a
fuller explanation.


A scratchpad or temporary workspace description alludes to its semi
permanent nature, and can warn that the subsequent commits may be lost
through aging and garbage collection until the user "commits" to
saving their progress through the creation a new branch, and thereby
making them permanent.


I must say the explanations presented in this thread have shed some
light on what is on the face of it a common trap that leaves new users
wondering "What happened to my work!" and I thank you all.

Steve

             reply	other threads:[~2010-02-01 11:52 UTC|newest]

Thread overview: 111+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-01 11:52 Steve Diver [this message]
2010-02-01 17:38 ` master^ is not a local branch -- huh?!? Junio C Hamano
2010-02-01 17:58   ` Sergei Organov
2010-02-01 22:52     ` Ron Garret
2010-02-01 23:01       ` Petr Baudis
2010-02-01 23:25       ` Nicolas Pitre
2010-02-01 23:37       ` Junio C Hamano
2010-02-01 23:56         ` Ron Garret
2010-02-02  0:15           ` Petr Baudis
2010-02-02  0:45             ` Ron Garret
2010-02-02  0:53               ` Junio C Hamano
2010-02-02  1:12                 ` Ron Garret
2010-02-02 19:19                   ` J. Bruce Fields
2010-02-02 22:04                     ` Ron Garret
2010-02-03 18:27                       ` J. Bruce Fields
2010-02-02  4:05               ` Nicolas Pitre
2010-02-02  5:23                 ` Ron Garret
2010-02-02  5:43                   ` Nicolas Pitre
2010-02-02 21:07                   ` tytso
2010-02-02  0:26           ` Junio C Hamano
2010-02-02  0:21       ` Junio C Hamano
2010-02-01 18:12   ` Nicolas Pitre
2010-02-01 18:27     ` Jay Soffian
2010-02-01 22:34     ` Steve Diver
  -- strict thread matches above, loose matches on Subject: below --
2010-01-29 20:20 Ron1
2010-01-29 20:27 ` Jacob Helwig
2010-01-29 20:35   ` Sverre Rabbelier
2010-01-29 20:38     ` Jacob Helwig
2010-01-29 20:48     ` Junio C Hamano
2010-01-29 20:56       ` Sverre Rabbelier
2010-01-29 21:35         ` Junio C Hamano
2010-01-29 21:20       ` Nicolas Pitre
2010-01-29 21:21         ` Sverre Rabbelier
2010-01-29 21:29           ` Nicolas Pitre
2010-01-29 21:32             ` Sverre Rabbelier
2010-01-29 21:51               ` Nicolas Pitre
2010-01-29 21:58                 ` Junio C Hamano
2010-01-29 22:00                   ` Sverre Rabbelier
2010-01-29 22:34                   ` Nicolas Pitre
2010-01-29 22:39                     ` Junio C Hamano
2010-01-29 22:46                       ` Jacob Helwig
2010-01-29 23:43                       ` Nicolas Pitre
2010-01-30  0:14                         ` Junio C Hamano
2010-01-30  0:18                           ` Sverre Rabbelier
2010-01-30  0:29                             ` Junio C Hamano
2010-01-30  0:35                               ` Sverre Rabbelier
2010-01-30  0:38                               ` Michael Witten
2010-01-30  0:39                               ` Nicolas Pitre
2010-01-30  1:01                               ` Mark Lodato
2010-01-30  1:22                                 ` Nicolas Pitre
2010-01-30  2:38                                   ` Ron Garret
2010-01-30  2:59                                     ` Junio C Hamano
2010-01-30  3:26                                       ` Ron Garret
2010-01-30  4:03                                         ` Nicolas Pitre
2010-01-30  5:06                                           ` Jay Soffian
2010-01-30  5:09                                         ` Junio C Hamano
2010-01-30  4:52                                       ` Jay Soffian
2010-01-30  5:15                                         ` Nicolas Pitre
2010-01-30  5:21                                           ` Junio C Hamano
2010-01-30  6:25                                             ` Ron Garret
2010-01-30 18:25                                               ` Junio C Hamano
2010-01-30  5:45                                           ` Jay Soffian
2010-01-30  5:18                                         ` Junio C Hamano
2010-01-30  6:23                                         ` Ron Garret
2010-01-30  2:40                                   ` Mark Lodato
2010-01-30  3:11                                     ` Nicolas Pitre
2010-01-30  3:59                                       ` Mark Lodato
2010-01-30  4:39                                         ` Nicolas Pitre
2010-01-30  5:05                                           ` Nicolas Pitre
2010-01-30  5:11                                             ` Jay Soffian
2010-01-30  5:25                                               ` Nicolas Pitre
2010-01-30  5:53                                           ` Mark Lodato
2010-01-30  6:03                                           ` Junio C Hamano
2010-01-30  8:59                 ` Jeff King
2010-01-30 18:40                   ` Ron Garret
2010-01-29 23:16               ` A Large Angry SCM
2010-01-29 21:49         ` Junio C Hamano
2010-01-30  2:13         ` Johannes Schindelin
2010-01-30  3:15           ` Nicolas Pitre
2010-01-29 20:35   ` Johannes Schindelin
2010-01-29 21:16     ` Ron1
2010-01-29 21:25       ` Jacob Helwig
2010-01-29 21:43         ` Ron Garret
2010-01-29 21:59           ` Junio C Hamano
2010-01-29 22:18             ` Ron Garret
2010-01-31  7:32     ` Junio C Hamano
2010-01-29 20:32 ` Octavio Alvarez
2010-01-29 21:34   ` Ron Garret
2010-01-29 22:32     ` Octavio Alvarez
2010-01-29 22:47       ` Ron Garret
2010-01-29 23:05         ` Octavio Alvarez
2010-01-29 23:12         ` Junio C Hamano
2010-01-29 23:30           ` Ron Garret
2010-01-29 23:28         ` Julian Phillips
2010-01-30  0:14           ` Ron Garret
2010-01-30  0:18             ` Ron Garret
2010-01-30 19:02               ` Junio C Hamano
2010-01-30 19:24                 ` Ron Garret
2010-01-29 20:36 ` Scott R. Godin
2010-01-29 21:24   ` Ron Garret
2010-01-29 21:28     ` Sverre Rabbelier
2010-01-29 21:40       ` Ron Garret
2010-01-29 21:54       ` Junio C Hamano
2010-01-29 22:12         ` Ron Garret
2010-01-30  0:33           ` Michael Witten
2010-01-30  3:06             ` Junio C Hamano
2010-01-30  6:16               ` Ron Garret
2010-01-30  6:45                 ` Junio C Hamano
2010-01-30  7:31                   ` Ron Garret
2010-01-30  8:02                     ` Junio C Hamano
2010-01-30  8:56                       ` Ron Garret

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=31a97741002010352x1ad27f26ia4d51857bb2d2d4f@mail.gmail.com \
    --to=squelch2@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.helwig@gmail.com \
    --cc=lodatom@gmail.com \
    --cc=nico@fluxnic.net \
    --cc=ron1@flownet.com \
    --cc=srabbelier@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.
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 NNTP newsgroup(s).