From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81120 Path: news.gmane.org!not-for-mail From: Eric S Fraga Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Wed, 1 Feb 2012 16:22:11 +0000 Message-ID: <87bopisevg.fsf@ucl.ac.uk> 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> <87d39zh9pm.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328113364 31363 80.91.229.3 (1 Feb 2012 16:22:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 16:22:44 +0000 (UTC) To: Original-X-From: ding-owner+M29401@lists.math.uh.edu Wed Feb 01 17:22:44 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 1RscxG-0001nG-KE for ding-account@gmane.org; Wed, 01 Feb 2012 17:22:42 +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 1Rscx6-0005CF-TU; Wed, 01 Feb 2012 10:22:32 -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 1Rscx6-0005CA-4F for ding@lists.math.uh.edu; Wed, 01 Feb 2012 10:22:32 -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 1Rscx1-0004Fc-Ab for ding@lists.math.uh.edu; Wed, 01 Feb 2012 10:22:32 -0600 Original-Received: from am1ehsobe005.messaging.microsoft.com ([213.199.154.208] helo=AM1EHSOBE004.bigfish.com) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Rscwz-0002cn-Po for ding@gnus.org; Wed, 01 Feb 2012 17:22:25 +0100 Original-Received: from mail26-am1-R.bigfish.com (10.3.201.240) by AM1EHSOBE004.bigfish.com (10.3.204.24) with Microsoft SMTP Server id 14.1.225.23; Wed, 1 Feb 2012 16:22:18 +0000 Original-Received: from mail26-am1 (localhost [127.0.0.1]) by mail26-am1-R.bigfish.com (Postfix) with ESMTP id 7B63726033E for ; Wed, 1 Feb 2012 16:22:18 +0000 (UTC) X-SpamScore: 3 X-BigFish: PS3(zzzz1202hzzz2dhc1bhc31hc1ah2a8h668h839h8e2h8e3hbe9k) X-Forefront-Antispam-Report: CIP:157.55.9.135;KIP:(null);UIP:(null);IPV:NLI;H:DB3PRD0104HT010.eurprd01.prod.exchangelabs.com;RD:none;EFVD:NLI Original-Received: from mail26-am1 (localhost.localdomain [127.0.0.1]) by mail26-am1 (MessageSwitch) id 1328113336527616_2869; Wed, 1 Feb 2012 16:22:16 +0000 (UTC) Original-Received: from AM1EHSMHS015.bigfish.com (unknown [10.3.201.232]) by mail26-am1.bigfish.com (Postfix) with ESMTP id 7335920004A for ; Wed, 1 Feb 2012 16:22:16 +0000 (UTC) Original-Received: from DB3PRD0104HT010.eurprd01.prod.exchangelabs.com (157.55.9.135) by AM1EHSMHS015.bigfish.com (10.3.207.153) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 1 Feb 2012 16:22:15 +0000 Original-Received: from localhost (85.210.141.126) by pod51002.outlook.com (10.3.186.104) with Microsoft SMTP Server (TLS) id 14.15.39.1; Wed, 1 Feb 2012 16:22:14 +0000 X-Face: av6A"vZ{AypDB`d^.T35oG%$E*Qh]4F)K=*$-NHz5{7WZfAFQFB]F@gf}l9`XLs9(iD?D/! nafKE,S#G!4W/flj=9(U{]t'lP,,5~:s*~;kKR Mail-Followup-To: ding@gnus.org In-Reply-To: <87d39zh9pm.fsf@dod.no> (Steinar Bang's message of "Tue, 31 Jan 2012 21:56:53 +0100") User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) X-Originating-IP: [85.210.141.126] X-UCLLIVE-SCLRULE: HASRUN X-OriginatorOrg: ucl.ac.uk X-Spam-Score: -2.9 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81120 Archived-At: Steinar Bang writes: > What you can do, is always merge with > cd ~/git/mgnus/ > git fetch > git merge --no-ff --no-commit orgin/no-gnus [...] very useful stuff omitted Just to say that this was the most helpful yet concise explanation on how to merge branches in git that I have run into. One email that I will keep for posterity. Thank you! -- : Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.92.1 + Ma Gnus v0.2