All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Aghiles <aghilesk@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>,
	Nicolas Sebrecht <nicolas.s.dev@gmx.fr>,
	Thomas Rast <trast@student.ethz.ch>,
	git list <git@vger.kernel.org>
Subject: Re: git pull suggestion
Date: Sat, 10 Apr 2010 00:35:35 -0400	[thread overview]
Message-ID: <20100410043535.GA22481@coredump.intra.peff.net> (raw)
In-Reply-To: <i2y3abd05a91004091233nc11ee5f8m4f40e7451e02518a@mail.gmail.com>

On Fri, Apr 09, 2010 at 03:33:35PM -0400, Aghiles wrote:

> It is another issue, but I feel that the 'dirty working directory' is
> one of the major usability hurdles for people migrating from svn
> and CVS (a git pull --merge-using-stash could address it, maybe).

I think this has been discussed before, but I couldn't find it in the
archives.

It is probably a little bit confusing because your pull will not
necessarily complete immediately. It may have conflicts, which you may
fix up, or you may "git reset --hard" to abort. But either way, you need
to remember that your dirty state was stashed and that you need to pull
it out after it's all done.

I think we would do better to tell the user about stash there, so they
can do it themselves. Then they know where their changes went and how to
get them back. Since v1.6.5.5, this error message now says:

  Your local changes to '%s' would be overwritten by merge.  Aborting.
  Please, commit your changes or stash them before you can merge.

What version of git are you using? If you (or others you are helping)
saw that message and it wasn't helpful, do you have any suggestions for
how to improve it?

-Peff

  reply	other threads:[~2010-04-10  4:36 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-07 23:17 git pull suggestion Aghiles
2010-04-08 15:54 ` Thomas Rast
2010-04-08 19:33   ` Aghiles
2010-04-08 23:11     ` Nicolas Sebrecht
2010-04-09  3:06       ` Aghiles
2010-04-09  3:49         ` Jeff King
2010-04-09 19:33           ` Aghiles
2010-04-10  4:35             ` Jeff King [this message]
2010-04-10  4:40               ` Junio C Hamano
2010-04-11  6:01               ` Aghiles
2010-04-11  7:37                 ` Junio C Hamano
2010-04-11 16:33                   ` Matthieu Moy
2010-04-12 20:18                   ` Aghiles
2010-04-12 21:35                     ` Junio C Hamano
2010-04-09 20:54           ` Aghiles

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=20100410043535.GA22481@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=Matthieu.Moy@imag.fr \
    --cc=aghilesk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=nicolas.s.dev@gmx.fr \
    --cc=trast@student.ethz.ch \
    /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.