From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81064 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 23:49:06 +0100 Organization: Programmerer Ingebrigtsen Message-ID: <87zkd31o9p.fsf@gnus.org> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328050257 29356 80.91.229.3 (31 Jan 2012 22:50:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 22:50:57 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29345@lists.math.uh.edu Tue Jan 31 23:50:57 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 1RsMXP-0005tk-0c for ding-account@gmane.org; Tue, 31 Jan 2012 23:50:55 +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 1RsMVz-0006sW-PS; Tue, 31 Jan 2012 16:49:27 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsMVy-0006sL-4U for ding@lists.math.uh.edu; Tue, 31 Jan 2012 16:49:26 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsMVw-00028V-2G for ding@lists.math.uh.edu; Tue, 31 Jan 2012 16:49:25 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsMVt-000126-PL for ding@gnus.org; Tue, 31 Jan 2012 23:49:21 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsMVq-0005Ie-Gg for ding@gnus.org; Tue, 31 Jan 2012 23:49:18 +0100 Original-Received: from 93-41-188-50.ip82.fastwebnet.it ([93.41.188.50]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 23:49:18 +0100 Original-Received: from larsi by 93-41-188-50.ip82.fastwebnet.it with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 23:49:18 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 20 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 93-41-188-50.ip82.fastwebnet.it Mail-Copies-To: never User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) Cancel-Lock: sha1:Wg1OeFd1M0uTynQJIo1VtfnuNL4= X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81064 Archived-At: 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... -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome