From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kyle Meyer <kyle@kyleam.com>
Subject: Re: git question
Date: Thu, 06 Jul 2017 09:24:19 -0400
Message-ID: <87mv8hu29o.fsf@kyleam.com>
References: <87h8yq9fuv.fsf@gmx.us>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55928)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1dT6ld-0005ep-9C
	for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 09:24:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1dT6la-0004W8-59
	for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 09:24:25 -0400
Received: from pb-smtp1.pobox.com ([64.147.108.70]:54826
	helo=sasl.smtp.pobox.com)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <kyle@kyleam.com>) id 1dT6lZ-0004Vo-TJ
	for emacs-orgmode@gnu.org; Thu, 06 Jul 2017 09:24:22 -0400
Received: from sasl.smtp.pobox.com (unknown [127.0.0.1])
	by pb-smtp1.pobox.com (Postfix) with ESMTP id B3EEA98616
	for <emacs-orgmode@gnu.org>; Thu,  6 Jul 2017 09:24:20 -0400 (EDT)
Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1])
	by pb-smtp1.pobox.com (Postfix) with ESMTP id ADA6998615
	for <emacs-orgmode@gnu.org>; Thu,  6 Jul 2017 09:24:20 -0400 (EDT)
Received: from localhost (unknown [24.60.167.92])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 298B998614
	for <emacs-orgmode@gnu.org>; Thu,  6 Jul 2017 09:24:20 -0400 (EDT)
In-Reply-To: <87h8yq9fuv.fsf@gmx.us>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: emacs-orgmode@gnu.org

Rasmus <rasmus@gmx.us> writes:

> 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?  Or is it better to just let it live on master and only be part of
> the next major Org version?

Yep, git cherry-pick should be used in these situations.

-- 
Kyle