From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: git question Date: Thu, 06 Jul 2017 11:58:01 +0000 Message-ID: References: <87h8yq9fuv.fsf@gmx.us> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f40304360a02c734f00553a4d4a5" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dT5QG-0008LR-9d for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 07:58:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dT5QF-0000Sf-4O for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 07:58:16 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:36472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dT5QE-0000SJ-SC for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 07:58:15 -0400 Received: by mail-lf0-x236.google.com with SMTP id h22so11795432lfk.3 for ; Thu, 06 Jul 2017 04:58:14 -0700 (PDT) In-Reply-To: <87h8yq9fuv.fsf@gmx.us> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Rasmus , emacs-orgmode@gnu.org --f40304360a02c734f00553a4d4a5 Content-Type: text/plain; charset="UTF-8" On Thu, Jul 6, 2017, 3:37 AM Rasmus wrote: > Hi, > > Re commit acabacaa5689f0644a47edae7c66bbdd68418194 > > > http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=acabacaa5689f0644a47edae7c66bbdd68418194 > > This should probably have gone to maint as it is a bugfix. For some > reason I pushed the commit to master. > > Could I now use git cherry-pick to add it maint? Or is there a better > way? I haven't tried this, but wouldn't that work: - Cherry pick that commit into maint - Merge maint into master My guess is that the second step will result in just a Merge commit in master, with just commit hash updates. But then the merge pointers between master and maint will also be synced. Or is it better to just let it live on master and only be part of > the next major Org version? > -- Kaushal Modi --f40304360a02c734f00553a4d4a5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Jul 6, 2017, 3:37 AM Ra= smus <rasmus@gmx.us> wrote:
<= /div>
Hi,

Re commit acabacaa5689f0644a47edae7c66bbdd68418194

=C2=A0 =C2=A0 http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=3Dacabacaa5689f= 0644a47edae7c66bbdd68418194

This should probably have gone to maint as it is a bugfix.=C2=A0 For some reason I pushed the commit to master.

Could I now use git cherry-pick to add it maint?=C2=A0 Or is there a better=
way?

I haven't tried this, but wo= uldn't that work:

- Cherry pick that commit in= to maint
- Merge maint into master

My gu= ess is that the second step will result in just a Merge commit in master, w= ith just commit hash updates. But then the merge pointers between master an= d maint will also be synced.=C2=A0

=C2=A0Or
is it better to just let it live on master and only be part = of
the next major Org version?
--
<= /div>

Kaushal Modi

--f40304360a02c734f00553a4d4a5--