From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81053 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 16:36:28 -0200 Message-ID: <87y5snlnwz.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328035046 9440 80.91.229.3 (31 Jan 2012 18:37:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 18:37:26 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29334@lists.math.uh.edu Tue Jan 31 19:37:26 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 1RsIa4-0003py-MU for ding-account@gmane.org; Tue, 31 Jan 2012 19:37:25 +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 1RsIZa-0005QS-NU; Tue, 31 Jan 2012 12:36:54 -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 1RsIZZ-0005QJ-LL for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12: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 1RsIZV-0007jS-Fk for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:36:53 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsIZU-0003KZ-2P for ding@gnus.org; Tue, 31 Jan 2012 19:36:48 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsIZT-0003Zx-OT for ding@gnus.org; Tue, 31 Jan 2012 19:36:47 +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 ; Tue, 31 Jan 2012 19:36:47 +0100 Original-Received: from rakuco by 201.82.194.83 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 19:36:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 15 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:l41ShDgTakS5uvg4efJrbCDrIbM= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81053 Archived-At: Lars Ingebrigtsen writes: > But I guess I don't really want to merge No Gnus as is into master. I > just want to cherry-pick any commits I make, I guess? I certainly don't > want to merge the commit I just did that bumped the version number to No > Gnus 0.20, for instance. You'd get a merge conflict at that point when merging anyway, so I don't think this kind of thing would end up slipping under the radar. > So how do I cherry-pick commits? git cherry-pick [-x] [--edit] , where can be the SHA-1 hash or any other way of pointing to a certain commit. I still think merging makes more sense, though.