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: "git pull -r" to avoid merge commits Date: Sat, 31 May 2014 16:42:48 +0300 Message-ID: <83lhtidpyf.fsf@gnu.org> References: <87a99yqe0d.fsf@zigzag.favinet> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1401543777 4613 80.91.229.3 (31 May 2014 13:42:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 May 2014 13:42:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Thien-Thi Nguyen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 31 15:42:50 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 1WqjYd-0000Nh-8Z for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 15:42:47 +0200 Original-Received: from localhost ([::1]:59844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjYc-0003O5-Uo for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 09:42:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjYV-0003LD-Bo for emacs-devel@gnu.org; Sat, 31 May 2014 09:42:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqjYP-0003oB-AS for emacs-devel@gnu.org; Sat, 31 May 2014 09:42:39 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:62402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjYP-0003nu-2t; Sat, 31 May 2014 09:42:33 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0N6F00I00XJO2900@a-mtaout21.012.net.il>; Sat, 31 May 2014 16:42:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N6F00IH8Y2V2C20@a-mtaout21.012.net.il>; Sat, 31 May 2014 16:42:31 +0300 (IDT) In-reply-to: <87a99yqe0d.fsf@zigzag.favinet> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:172214 Archived-At: > From: Thien-Thi Nguyen > Date: Sat, 31 May 2014 15:22:26 +0200 > > In the ELPA repo, i see "Merge branch 'master' of git+ssh://...", > which are merge commits IIUC. I suspect this event confused the > admin scripts and so prevented the (recently released) xpm 1.0.2 > From auto-generating a post to info-gnu-emacs. Is that correct? > > On the contributor side, i regularly use "git pull -r" because i > believe doing so avoids creating merge commits. (This is based > on git-push(1) section "NOTE ABOUT FAST-FORWARDS", primarily.) > Am i missing something? Is there a better way to avoid merge > commits? Why would you need to avoid merge commits? If they confuse the admin scripts, then perhaps fixing those scripts is a better way.