From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81079 Path: news.gmane.org!not-for-mail From: Raphael Kubo da Costa Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 22:40:01 -0200 Message-ID: <87d39zl732.fsf@FreeBSD.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> <87zkd31o9p.fsf@gnus.org> <87hazbl8ld.fsf@FreeBSD.org> <87fwevz95x.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328056821 6421 80.91.229.3 (1 Feb 2012 00:40:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 00:40:21 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29360@lists.math.uh.edu Wed Feb 01 01:40:21 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 1RsOFI-0006ax-6p for ding-account@gmane.org; Wed, 01 Feb 2012 01:40:20 +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 1RsOFG-0007uQ-Am; Tue, 31 Jan 2012 18:40:18 -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 1RsOFF-0007uF-Ah for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:40:17 -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 1RsOFB-0000w3-6f for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:40:17 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsOF9-0003z2-Pr for ding@gnus.org; Wed, 01 Feb 2012 01:40:11 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsOF8-0006Xe-Jy for ding@gnus.org; Wed, 01 Feb 2012 01:40:10 +0100 Original-Received: from 201.82.194.83 ([201.82.194.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 01:40:10 +0100 Original-Received: from rakuco by 201.82.194.83 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 01:40:10 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 16 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 201.82.194.83 User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.90 (berkeley-unix) Cancel-Lock: sha1:iNkHj3nPV3c59LLhp/8a7L9NLxI= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81079 Archived-At: Lars Ingebrigtsen writes: > Raphael Kubo da Costa writes: > >> 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. > > I didn't want the history, either, but I did want to discard all the > changes. I thought the opposite was the desired outcome? I mean, if you are in master and merge no-gnus, you'd want the commits made to no-gnus in the commit log and also the bug fixes they bring. If you use "-s ours", you'll only get the history, but all the commit contents (ie. bug fixes) will be dropped.