From: Junio C Hamano <junkio@cox.net>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] tone down the detached head warning
Date: Wed, 31 Jan 2007 19:23:21 -0800 [thread overview]
Message-ID: <7vd54ur26u.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 20070201030030.GA1979@coredump.intra.peff.net
Jeff King <peff@peff.net> writes:
> I think part of the "scariness" of the message is that git-checkout does
> not _usually_ produce output. I wonder if, when switching HEAD, it
> usually printed "Now on branch <foo>", and for detached printed some
> special variant, it would seem more natural.
That sounds sensible. Another thing I found slightly annoying
about branch switching in git-checkout is that we list the paths
with local changes only when the tip of the old branch and the
new branch are different. Very often I start hacking while on
'master' and later find the change forms a concrete "theme", and
then say "git checkout -b that-theme" to switch a branch; in
such a case I do want the list of locally modified paths.
For example:
: gitster project/master; edit foo.c
: gitster project/master; git checkout -b theme
M foo.c
Switched to a new branch "theme"
: gitster project/theme; edit bar.c
: gitster project/theme; git checkout master
M bar.c
M foo.c
Switched to branch "master"
: gitster project/master; git checkout master^
M bar.c
M foo.c
Detached your HEAD -- you are not on any branch.
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
: gitster project;
would feel very natural and much less scary.
Note. I run with PS1=': \h \W$(__git_ps1 "/%s"); '.
next prev parent reply other threads:[~2007-02-01 3:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-31 19:10 [PATCH] tone down the detached head warning Nicolas Pitre
2007-01-31 23:19 ` Jeff King
2007-01-31 23:25 ` Jakub Narebski
2007-01-31 23:27 ` Jeff King
2007-01-31 23:33 ` Jakub Narebski
2007-01-31 23:54 ` Carl Worth
2007-02-01 0:14 ` Jakub Narebski
2007-02-01 8:44 ` Andy Parkins
2007-02-01 12:48 ` Matthias Lederhofer
2007-02-01 0:11 ` Nicolas Pitre
2007-02-01 3:00 ` Jeff King
2007-02-01 3:23 ` Junio C Hamano [this message]
2007-02-01 3:29 ` Jeff King
2007-02-01 3:47 ` Nicolas Pitre
2007-02-01 3:54 ` Jeff King
2007-02-01 9:08 ` [PATCH] detached HEAD -- finishing touches Junio C Hamano
2007-02-01 9:46 ` Raimund Bauer
2007-02-01 9:53 ` Alex Riesen
2007-02-01 9:54 ` Alex Riesen
2007-02-01 18:44 ` [PATCH] git-checkout: disable guides how to switch branches with ui.guide Matthias Lederhofer
2007-02-01 20:42 ` Junio C Hamano
2007-02-01 20:51 ` Matthias Lederhofer
2007-02-01 21:06 ` Junio C Hamano
2007-02-01 21:23 ` Matthias Lederhofer
2007-02-01 21:34 ` Carl Worth
2007-02-01 21:59 ` Nicolas Pitre
2007-02-01 22:16 ` Carl Worth
2007-02-01 23:18 ` Jakub Narebski
2007-02-01 21:52 ` [PATCH] detached HEAD -- finishing touches Theodore Tso
2007-02-02 1:11 ` Junio C Hamano
2007-02-02 1:16 ` Theodore Tso
2007-02-02 1:27 ` Carl Worth
2007-02-02 1:30 ` Junio C Hamano
2007-02-02 1:46 ` Carl Worth
2007-02-02 2:38 ` 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=7vd54ur26u.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=peff@peff.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.
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).