All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: "git checkout" branch switching safety broken in 'next'
Date: Mon, 10 Mar 2008 10:29:00 +0100	[thread overview]
Message-ID: <fr2v0s$cdb$1@ger.gmane.org> (raw)
In-Reply-To: 7vmyp7j8ui.fsf@gitster.siamese.dyndns.org

Junio C Hamano wrote:

> Traditionally, when you have a change in the work tree, and switch to
> another branch that has different contents in the modified path, we
> errored out by saying:
> 
>     error: Entry 'foo' not uptodate. Cannot merge.

By the way, could this error message be made less cryptic? It is there
since the very beginning, and was not changed during making error
messages more user friendly...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

  reply	other threads:[~2008-03-10  9:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-10  8:12 "git checkout" branch switching safety broken in 'next' Junio C Hamano
2008-03-10  9:29 ` Jakub Narebski [this message]
2008-03-10 13:56   ` Jay Soffian
2008-03-11  8:57     ` setting git-gui locale Maxim Fridental
2008-03-11 10:01       ` Johannes Schindelin
2008-03-10 14:38 ` "git checkout" branch switching safety broken in 'next' Linus Torvalds
2008-03-11  2:41   ` "git diff-index" " Junio C Hamano
2008-03-11  3:20     ` Linus Torvalds

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='fr2v0s$cdb$1@ger.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    /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.