From: Eli Zaretskii <eliz@gnu.org>
To: David Kastrup <dak@gnu.org>
Cc: acm@muc.de, sven.axelsson@gmail.com, emacs-devel@gnu.org
Subject: Re: Stupid git!
Date: Mon, 14 Sep 2015 15:37:36 +0300 [thread overview]
Message-ID: <83a8sp9nxr.fsf@gnu.org> (raw)
In-Reply-To: <8737yhw5gp.fsf@fencepost.gnu.org>
> From: David Kastrup <dak@gnu.org>
> Cc: acm@muc.de, sven.axelsson@gmail.com, emacs-devel@gnu.org
> Date: Mon, 14 Sep 2015 14:28:06 +0200
>
> 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.
How is using 2 commands instead of one, and learning an additional
command, simpler?
> > 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.
We've concluded long ago that "pull --rebase" is trouble when you
merge from and to feature branches, so I'm trying to stay away of that
path.
next prev parent reply other threads:[~2015-09-14 12:37 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-12 10:15 Stupid git! Alan Mackenzie
2015-09-12 10:21 ` Alan Mackenzie
2015-09-12 10:40 ` Dmitry Gutov
2015-09-12 12:29 ` Alan Mackenzie
2015-09-12 12:34 ` David Kastrup
2015-09-12 12:59 ` Alan Mackenzie
2015-09-12 20:14 ` Dmitry Gutov
2015-09-14 10:09 ` Steinar Bang
2015-09-12 20:37 ` Stefan Monnier
2015-09-12 10:40 ` David Kastrup
2015-09-12 10:53 ` Dmitry Gutov
2015-09-12 12:52 ` Alan Mackenzie
2015-09-12 11:45 ` Giuseppe Scrivano
2015-09-12 13:02 ` Alan Mackenzie
2015-09-12 14:12 ` Andreas Schwab
2015-09-12 15:16 ` Eli Zaretskii
2015-09-12 20:36 ` Alan Mackenzie
2015-09-12 20:43 ` Dmitry Gutov
2015-09-12 21:51 ` Alan Mackenzie
2015-09-13 6:22 ` Sven Axelsson
2015-09-14 10:21 ` Alan Mackenzie
2015-09-14 10:29 ` David Kastrup
2015-09-14 12:19 ` Eli Zaretskii
2015-09-14 12:28 ` David Kastrup
2015-09-14 12:37 ` Eli Zaretskii [this message]
2015-09-14 12:47 ` David Kastrup
2015-09-14 13:38 ` Eli Zaretskii
2015-09-14 13:44 ` David Kastrup
2015-09-14 12:38 ` Stefan Monnier
2015-09-13 6:49 ` Eli Zaretskii
2015-09-14 10:49 ` Alan Mackenzie
2015-09-15 0:24 ` Stephen J. Turnbull
2015-09-13 20:28 ` Dmitry Gutov
2015-09-14 3:11 ` Stephen J. Turnbull
2015-09-14 13:47 ` Dmitry Gutov
2015-09-14 11:09 ` Alan Mackenzie
2015-09-14 12:22 ` Eli Zaretskii
2015-09-14 13:42 ` Dmitry Gutov
2015-09-14 17:05 ` Steinar Bang
2015-09-14 10:37 ` Steinar Bang
2015-09-13 6:42 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83a8sp9nxr.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=acm@muc.de \
--cc=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=sven.axelsson@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).