From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 15:37:36 +0300 Message-ID: <83a8sp9nxr.fsf@gnu.org> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <20150914102158.GA3208@acm.fritz.box> <877fntway6.fsf@fencepost.gnu.org> <83d1xl9osa.fsf@gnu.org> <8737yhw5gp.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442234287 8031 80.91.229.3 (14 Sep 2015 12:38:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 12:38:07 +0000 (UTC) Cc: acm@muc.de, sven.axelsson@gmail.com, emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 14:37:58 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZbT1B-0001mO-16 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 14:37:57 +0200 Original-Received: from localhost ([::1]:40428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbT1A-0006c3-Ef for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 08:37:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbT0y-0006bu-1O for emacs-devel@gnu.org; Mon, 14 Sep 2015 08:37:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbT0x-0003pd-31 for emacs-devel@gnu.org; Mon, 14 Sep 2015 08:37:43 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:52576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbT0s-0003kr-EC; Mon, 14 Sep 2015 08:37:38 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NUO00P002QB6N00@mtaout29.012.net.il>; Mon, 14 Sep 2015 15:38:06 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUO00KJX33IBQ60@mtaout29.012.net.il>; Mon, 14 Sep 2015 15:38:06 +0300 (IDT) In-reply-to: <8737yhw5gp.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:189938 Archived-At: > From: David Kastrup > Cc: acm@muc.de, sven.axelsson@gmail.com, emacs-devel@gnu.org > Date: Mon, 14 Sep 2015 14:28:06 +0200 > > Eli Zaretskii writes: > > >> From: David Kastrup > >> Date: Mon, 14 Sep 2015 12:29:37 +0200 > >> Cc: Sven Axelsson , emacs > >> > >> 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.