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: Sat, 12 Sep 2015 18:16:51 +0300 Message-ID: <83egi3brbw.fsf@gnu.org> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442071046 10843 80.91.229.3 (12 Sep 2015 15:17:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 15:17:26 +0000 (UTC) Cc: gscrivano@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 17:17:15 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 1ZamYD-0004v4-Ew for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 17:17:13 +0200 Original-Received: from localhost ([::1]:32814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZamYC-0002dj-Ot for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 11:17:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZamY1-0002dN-7F for emacs-devel@gnu.org; Sat, 12 Sep 2015 11:17:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZamXx-0007kO-Lr for emacs-devel@gnu.org; Sat, 12 Sep 2015 11:17:01 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:49351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZamXx-0007jv-Do; Sat, 12 Sep 2015 11:16:57 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NUK00J00KZM2N00@mtaout29.012.net.il>; Sat, 12 Sep 2015 18:17:22 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00DFSL4YZN50@mtaout29.012.net.il>; Sat, 12 Sep 2015 18:17:22 +0300 (IDT) In-reply-to: <20150912130255.GF2322@acm.fritz.box> 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:189868 Archived-At: > Date: Sat, 12 Sep 2015 13:02:55 +0000 > From: Alan Mackenzie > Cc: emacs-devel@gnu.org > > > Have you used --rebase to pull to apply your commits after you pulled > > all the changes from the remote repository? > > No, I didn't. I should have done. I don't think there are any > disadvantages to doing so. We already considered that around the time we switched to Git, and decided against it. The disadvantages you don't see come up when you are merging from a feature branch, and you have also merged from master to that branch. So instead of rebasing we recommend just "git pull", which will merge the upstream changes with yours.