From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 22 Nov 2014 10:29:16 +0100 Organization: Probably a good idea Message-ID: 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 1416648572 9391 80.91.229.3 (22 Nov 2014 09:29:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 09:29:32 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 10:29:25 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 1Xs70M-0007Wo-3a for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 10:29:22 +0100 Original-Received: from localhost ([::1]:44525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs70L-0002H5-L0 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 04:29:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs70C-0002Ga-1G for emacs-devel@gnu.org; Sat, 22 Nov 2014 04:29:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs705-0001m7-Lz for emacs-devel@gnu.org; Sat, 22 Nov 2014 04:29:11 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs705-0001m2-Eh for emacs-devel@gnu.org; Sat, 22 Nov 2014 04:29:05 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xs704-0007Q3-JJ for emacs-devel@gnu.org; Sat, 22 Nov 2014 10:29:04 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 22 Nov 2014 10:29:04 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 22 Nov 2014 10:29:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 9 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:wkN2c96C4UMWiX0F6ZFcQKsuu4A= 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:177980 Archived-At: >>>>> 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)