git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aghiles <aghilesk@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, 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: Mon, 12 Apr 2010 16:18:23 -0400	[thread overview]
Message-ID: <s2m3abd05a91004121318x22b1f712tdd5600ad656c6b13@mail.gmail.com> (raw)
In-Reply-To: <7vaataphi7.fsf@alter.siamese.dyndns.org>

On Sun, Apr 11, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>
> The other answer would initially appear a bit sad, but after you think
> about it, it would turn into an enlightenment, especially for people whose
> brains have rotten from years and years of CVS/SVN use.

My brain was rotten even _before_ CVS/SVN use, so you can picture
the damage.

Now, thank you very much for taking the time to explain everything. I had
a vague understanding but now things are clearer.

I think that there was a document back in the day, that was giving a
relationship between CVS/SVN commands and git. A posteriori, that
document did more harm than good: it made you believe that you could
use git as CVS/SVN. In practice, that is very difficult and error prone.

> Now, the above inevitably solicits "then why doesn't 'pull' automatically
> stash and then unstash?" question.  I think the answer is obvious if you
> think about it, and it is getting late, so I'll leave that as an exercise
> to the readers but will leave a pictorial hint.

Before I start thinking I already have a question (which says a lot about
my thinking capacity): can't git detect this  problematic case ? My feeling
is that an automatic stash/unstash will  work in most cases and could be
triggered by a --dirty flag.

  -- aghiles

  parent reply	other threads:[~2010-04-12 20:18 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
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 [this message]
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=s2m3abd05a91004121318x22b1f712tdd5600ad656c6b13@mail.gmail.com \
    --to=aghilesk@gmail.com \
    --cc=Matthieu.Moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nicolas.s.dev@gmx.fr \
    --cc=peff@peff.net \
    --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 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).