From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: "git pull -r" to avoid merge commits Date: Sat, 31 May 2014 15:54:43 +0200 Organization: Organization?!? Message-ID: <87zjhycau4.fsf@fencepost.gnu.org> References: <87a99yqe0d.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1401544527 12625 80.91.229.3 (31 May 2014 13:55:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 May 2014 13:55:27 +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:55:20 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 1Wqjkl-0003VD-DS for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 15:55:19 +0200 Original-Received: from localhost ([::1]:59860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqjkl-0002Rm-2Q for ged-emacs-devel@m.gmane.org; Sat, 31 May 2014 09:55:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqjkb-0002Bg-PQ for emacs-devel@gnu.org; Sat, 31 May 2014 09:55:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqjkS-0007tg-Eh for emacs-devel@gnu.org; Sat, 31 May 2014 09:55:09 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:38852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqjkS-0007tQ-88 for emacs-devel@gnu.org; Sat, 31 May 2014 09:55:00 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WqjkN-0003Bn-Lb for emacs-devel@gnu.org; Sat, 31 May 2014 15:54:55 +0200 Original-Received: from x2f3f23c.dyn.telefonica.de ([2.243.242.60]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 31 May 2014 15:54:55 +0200 Original-Received: from dak by x2f3f23c.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 31 May 2014 15:54:55 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 54 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f3f23c.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) Cancel-Lock: sha1:k4NyXqk6ayIXKE/L7JFPEVT/rlg= 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:172215 Archived-At: Thien-Thi Nguyen writes: > 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? Is there a better way to ensure announcement trigger? man git-config contains all of those: branch.autosetuprebase When a new branch is created with git branch or git checkout that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see "branch..rebase"). When never, rebase is never automatically set to true. When local, rebase is set to true for tracked branches of other local branches. When remote, rebase is set to true for tracked branches of remote-tracking branches. When always, rebase will be set to true for all tracking branches. See "branch.autosetupmerge" for details on how to set up a branch to track another branch. This option defaults to never. branch..rebase When true, rebase the branch on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. pull.rebase When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "branch..rebase" for setting this on a per-branch basis. When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. -- David Kastrup