From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 18:32:54 +0100 Message-ID: <87r3woa6rd.fsf@engster.org> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417109610 24399 80.91.229.3 (27 Nov 2014 17:33:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:33:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:33:24 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 1Xu2wV-0001XZ-9V for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:33:23 +0100 Original-Received: from localhost ([::1]:40936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2wS-0002ZF-NO for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:33:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2wB-0002XN-5s for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:33:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu2w5-00042k-09 for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:33:03 -0500 Original-Received: from randomsample.de ([5.45.97.173]:55623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2w4-00042W-Qj for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:32:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:To:From; bh=QLc18W8UVTqDdMCGWF1HtzDwOYsGNXRrVPhFXgMj6kI=; b=CeKm13JLLIe9XC1k9congwcg5DQbFpkaTRYQ4ydwbQf0iNDAEs3SJp1SHjGnkfCSFBGP/ytR4RUZzi1LdSyfVzZMXPsHsL5FGC77W4lMRmA62fe0oiM+jZfHFMiW98ES; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xu2w4-0007px-4c for emacs-devel@gnu.org; Thu, 27 Nov 2014 18:32:56 +0100 In-Reply-To: <878uiw7q5n.fsf@lifelogs.com> (Ted Zlatanov's message of "Thu, 27 Nov 2014 08:02:12 -0500") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:178370 Archived-At: 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. You cannot exclude them, but you can merge them with merge strategy 'ours'. That's what gitmerge.el does. > You have to either cherry-pick the ones you want instead of merging, Which defies the point of merging, of course. > or revert the ones you don't want after merging. That's cumbersome when those commits have conflicts, which is very common since it is often the reason they should be skipped in the first place. > 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: I think the easiest way to avoid this is to merge the remote branch instead of the local tracking one. -David