From: "Jay Soffian" <jaysoffian@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] "needs update" considered harmful
Date: Mon, 21 Jul 2008 14:17:22 -0400 [thread overview]
Message-ID: <76718490807211117t3c1d1194tee1c5dca686df8be@mail.gmail.com> (raw)
In-Reply-To: <7v1w1pdmi8.fsf@gitster.siamese.dyndns.org>
On Sun, Jul 20, 2008 at 3:48 AM, Junio C Hamano <gitster@pobox.com> wrote:
> The previous two variants both aim to reword the somewhat unpopular "needs
> update" message to easier "locally modified".
As a git beginner I would still be a confused. I think git beginners
need to understand three concepts very early:
- committed changes
- staged changes
- unstaged changes
I think saying "unstaged changes" instead of "locally modified" would
be consistent with the git add and rm man pages and less confusing.
On a related note, I don't understand the need for two different messages here:
$ echo stuff >> foo
$ git co master
error: You have local changes to 'foo'; cannot switch branches.
$ git add foo
$ git co master
error: Entry 'foo' would be overwritten by merge. Cannot merge.
A single message "You have uncommitted changes to 'foo'; cannot switch
branches." would suffice, no?
$0.02.
j.
next prev parent reply other threads:[~2008-07-21 18:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 6:31 [PATCH] refresh-index: fix bitmask assignment Junio C Hamano
2008-07-20 7:03 ` Junio C Hamano
2008-07-20 7:28 ` Junio C Hamano
2008-07-20 7:48 ` [RFC] "needs update" considered harmful Junio C Hamano
2008-07-21 18:17 ` Jay Soffian [this message]
2008-07-20 7:48 ` [RFC variant 1 of 2] " Junio C Hamano
2008-07-20 7:48 ` [RFC variant 2 " Junio C Hamano
2008-07-20 11:29 ` Petr Baudis
2008-07-20 12:41 ` Johannes Schindelin
2008-07-20 19:29 ` Junio C Hamano
2008-07-21 17:27 ` Jay Soffian
2008-07-20 14:03 ` André Goddard Rosa
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=76718490807211117t3c1d1194tee1c5dca686df8be@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).