From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 19:30:12 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87mw7c5fqj.fsf@lifelogs.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> <87r3woa6rd.fsf@engster.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417134630 22853 80.91.229.3 (28 Nov 2014 00:30:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 00:30:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 01:30:21 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 1Xu9S1-0002oK-9l for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 01:30:21 +0100 Original-Received: from localhost ([::1]:42091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9S0-0003eq-Nl for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 19:30:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9Rs-0003el-K7 for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:30:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu9Rm-0004Hi-Is for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:30:12 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:53772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9Rm-0004GW-DB for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:30:06 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xu9Rj-0002iQ-5i for emacs-devel@gnu.org; Fri, 28 Nov 2014 01:30:03 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:30:03 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:30:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:tsmDvZrBGifyMOQ5yfb8EQQVn+4= 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:178387 Archived-At: On Thu, 27 Nov 2014 18:32:54 +0100 David Engster wrote: DE> Ted Zlatanov writes: >> I don't think Git merges can work that way, though. They bring in the >> whole branch, you can't exclude some commits. DE> You cannot exclude them, but you can merge them with merge strategy DE> 'ours'. That's what gitmerge.el does. Yup, I see that. Lovely; I had always applied the strategy to the whole commit before. >> I can't believe I did that. Sorry. It's not harmful, but I was >> careless. I've now added this alias to my gitconfig: DE> I think the easiest way to avoid this is to merge the remote branch DE> instead of the local tracking one. Oh, that's very helpful. I have always had to remember to update the local branch and then merge from it. Thanks for the hints. Ted