[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Stupid git!
From: |
David Kastrup |
Subject: |
Re: Stupid git! |
Date: |
Mon, 14 Sep 2015 14:28:06 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> From: David Kastrup <address@hidden>
>> Date: Mon, 14 Sep 2015 12:29:37 +0200
>> Cc: Sven Axelsson <address@hidden>, emacs <address@hidden>
>>
>> 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
- Re: Stupid git!, (continued)
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!, Andreas Schwab, 2015/09/12
- Re: Stupid git!, Eli Zaretskii, 2015/09/12
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!, Dmitry Gutov, 2015/09/12
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!, Sven Axelsson, 2015/09/13
- Re: Stupid git!, Alan Mackenzie, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!,
David Kastrup <=
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Stefan Monnier, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/13
- Re: Stupid git!, Alan Mackenzie, 2015/09/14
- Re: Stupid git!, Stephen J. Turnbull, 2015/09/14
- Re: Stupid git!, Dmitry Gutov, 2015/09/13
- Re: Stupid git!, Stephen J. Turnbull, 2015/09/13