From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 23 Nov 2014 10:28:32 -0800 Organization: Newt Software Message-ID: <87mw7hzs8f.fsf@olgas.newt.com> References: <87sihkicso.fsf@Rainer.invalid> <87vbmfym7i.fsf@olgas.newt.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416767353 23357 80.91.229.3 (23 Nov 2014 18:29:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 18:29:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 19:29:07 2014 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 1XsbuC-0007Xa-HH for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 19:29:04 +0100 Original-Received: from localhost ([::1]:49629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbuC-0001Go-2a for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 13:29:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsbu3-00018O-SP for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:29:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsbty-0000md-Kz for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:28:55 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsbty-0000mX-EG for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:28:50 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xsbtw-0007M8-DY for emacs-devel@gnu.org; Sun, 23 Nov 2014 19:28:48 +0100 Original-Received: from c-24-6-53-16.hsd1.ca.comcast.net ([24.6.53.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 19:28:48 +0100 Original-Received: from wohler by c-24-6-53-16.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 19:28:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-53-16.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (gnu/linux) Cancel-Lock: sha1:1+XclL98lnw6vTQBHXo+jC04vW4= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:178109 Archived-At: Steinar Bang writes: >>>>>> Bill Wohler : > >> I'd second setting it globally to ensure that it happens universally >> to avoid the spurious merge commits that otherwise ensue. > > (I've never understood why "spurious merge commits" bother people so > much. Personally I'm much more concerned with what might happen to my > individual commits if I'm hitting a conflict during rebase: the commit's > diff may no longer be the clear and meaningful diff I indented it to be) Like many things, it depends. If a merge in either direction doesn't add any information, it's spurious. If it's useful, it's not spurious. For me, a merge commit from a pull breaks up the flow of my unpushed commits and usually doesn't add anything. I can imagine that folks used to Subversion would prefer pull --rebase as well as that mimics svn update. Sort of. If it's vital to capture that merge in the middle of your own commits, then the pull should be merged. I've just never encountered this situation. In the situation you presented, could you use git rebase --abort and then run git merge origin/master to recover? In any event, there is no right or wrong answer. It all depends. p.s. Hey Steiner, long time no "see"! -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD