From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 20:36:58 +0000 Message-ID: <20150912203658.GA3711@acm.fritz.box> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442090173 5889 80.91.229.3 (12 Sep 2015 20:36:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 20:36:13 +0000 (UTC) Cc: gscrivano@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 22:36:04 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 1ZarWl-0002ru-Rj for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 22:36:03 +0200 Original-Received: from localhost ([::1]:33652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarWl-0002ye-3F for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 16:36:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarWZ-0002uT-13 for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:35:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZarWV-0006hN-S6 for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:35:50 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:45237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarWV-0006gm-GQ for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:35:47 -0400 Original-Received: (qmail 95667 invoked by uid 3782); 12 Sep 2015 20:35:45 -0000 Original-Received: from acm.muc.de (p548A4594.dip0.t-ipconnect.de [84.138.69.148]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 12 Sep 2015 22:35:44 +0200 Original-Received: (qmail 3814 invoked by uid 1000); 12 Sep 2015 20:36:59 -0000 Content-Disposition: inline In-Reply-To: <83egi3brbw.fsf@gnu.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 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:189875 Archived-At: Hello, Eli. On Sat, Sep 12, 2015 at 06:16:51PM +0300, Eli Zaretskii wrote: > > 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. I just did `git pull'. This didn't merge the upstream changes into my repository. Instead it put the upstream file change into my working directory, discarding the other contributer's change log. If I understand correctly, that is. I think the best thing for me to do now is `git checkout ' to revert that changed file, then `git pull --rebase' to get the change again (and likely, quite a few others which have been done since), then `git push' to get my change into savannah. -- Alan Mackenzie (Nuremberg, Germany).