From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81077 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Wed, 01 Feb 2012 01:36:45 +0100 Message-ID: References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> <87aa54riih.fsf@dod.no> <87bopkc0dq.fsf@gnus.org> <87hazb26fm.fsf@dod.no> <87ty3b6c0d.fsf@gnus.org> <87y5snlnwz.fsf@FreeBSD.org> <87obtj4sqf.fsf@gnus.org> <878vknh9kq.fsf@dod.no> <87zkd31o9p.fsf@gnus.org> <87hazbl8ld.fsf@FreeBSD.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328056623 5205 80.91.229.3 (1 Feb 2012 00:37:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 00:37:03 +0000 (UTC) Cc: ding@gnus.org To: Raphael Kubo da Costa Original-X-From: ding-owner+M29358@lists.math.uh.edu Wed Feb 01 01:37:02 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RsOC5-0005Qq-Fz for ding-account@gmane.org; Wed, 01 Feb 2012 01:37:01 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RsOBz-0007pm-Bs; Tue, 31 Jan 2012 18:36:55 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsOBx-0007pV-UW for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:36:53 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsOBt-0000vI-I4 for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:36:53 -0600 Original-Received: from mail-out.m-online.net ([212.18.0.10]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsOBr-0003tF-Qk for ding@gnus.org; Wed, 01 Feb 2012 01:36:47 +0100 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id DE740180008E; Wed, 1 Feb 2012 01:36:46 +0100 (CET) X-Auth-Info: O9I7oDiPqVhUFi8FuJb/Q6EFBbaQkbPHroMkgzr2hQs= Original-Received: from igel.home (ppp-88-217-120-178.dynamic.mnet-online.de [88.217.120.178]) by mail.mnet-online.de (Postfix) with ESMTPA id E99E51C0005D; Wed, 1 Feb 2012 01:36:46 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 446A6CA299; Wed, 1 Feb 2012 01:36:45 +0100 (CET) X-Yow: There's a lot of BIG MONEY in MISERY if you have an AGENT!! In-Reply-To: <87hazbl8ld.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Tue, 31 Jan 2012 22:07:26 -0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81077 Archived-At: Raphael Kubo da Costa writes: > Lars Ingebrigtsen writes: > >> Steinar Bang writes: >> >>> If you know that the current changes in no-gnus that differ from master >>> don't apply, then just >>> git fetch >>> git merge -s ours orgin/no-gnus >>> and you won't be bothered by those changes on future merges (until those >>> files change again) >>> >>> "-s ours" means "make it look like a merge, but all stuff on the current >>> branch stays the way it is". >> >> Great! That has to be just what I need right now, I think, since none >> of the changes I made to No Gnus should end up in Ma Gnus. >> >> I'll try that now... > > Are you sure "-s ours" is what you are looking for? If you are on branch > master and use `git merge -s ours no-gnus`, it will effectively bring > no-gnus' history in, but discard _all_ changes from no-gnus. The two commits that were merged here are only intended for the no-gnus branch, so it looks good. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."