From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: "git pull -r" to avoid merge commits Date: Sat, 31 May 2014 15:22:26 +0200 Message-ID: <87a99yqe0d.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1401542390 22872 80.91.229.3 (31 May 2014 13:19:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 May 2014 13:19:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 31 15:19:42 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 1WqjCH-0004fI-23 for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 15:19:41 +0200 Original-Received: from localhost ([::1]:59787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjCG-0000Ca-Kb for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 09:19:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjC5-00009A-2b for emacs-devel@gnu.org; Sat, 31 May 2014 09:19:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqjBx-0003oI-Jy for emacs-devel@gnu.org; Sat, 31 May 2014 09:19:29 -0400 Original-Received: from smtp208.alice.it ([82.57.200.104]:10697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjBx-0003nj-9D for emacs-devel@gnu.org; Sat, 31 May 2014 09:19:21 -0400 Original-Received: from zigzag.favinet (79.31.70.185) by smtp208.alice.it (8.6.060.28) id 52443B822DC7D11A for emacs-devel@gnu.org; Sat, 31 May 2014 15:19:19 +0200 Original-Received: from ttn by zigzag.favinet with local (Exim 4.80) (envelope-from ) id 1WqjFB-00009a-Uf for emacs-devel@gnu.org; Sat, 31 May 2014 15:22:42 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 82.57.200.104 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:172212 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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=20auto-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? Is there a better way to ensure announcement trigger? =2D-=20 Thien-Thi Nguyen GPG key: 4C807502 (if you're human and you know it) read my lisp: (responsep (questions 'technical) (not (via 'mailing-list))) =3D> nil --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlOJ15sACgkQZwMiJEyAdQJImQCgkTJHSYc7DUOjnwpWroAOy/d/ zOUAmwYUWcVP/5ztiglN23noi+IXeCWD =rKP1 -----END PGP SIGNATURE----- --=-=-=--