Re: Stupid git!

[David Kastrup <dak@gnu.org>]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: David Kastrup <dak@gnu.org>
>> Date: Mon, 14 Sep 2015 12:29:37 +0200
>> Cc: Sven Axelsson <sven.axelsson@gmail.com>, emacs <emacs-devel@gnu.org>
>> 
>> Pulling is not a really good thing to do if you have uncommitted work.
>
> I'm doing it all the time, and have yet to report a single problem.
>
> It's the simplest way of minimizing the probability of spurious
> merges, when someone else pushes before you.

Nope.  The simplest way is to git fetch rather than git pull.  Then
nothing at all happens to your work directory and index and you are
completely free to choose your course of action.

> If you commit then pull, and someone else pushed in between, you will
> get that "merged branch master" thing.

It that's not what you want, git pull -r will rebase just fine.

-- 
David Kastrup