emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: emacs-orgmode@gnu.org
Subject: Re: git question
Date: Thu, 06 Jul 2017 09:24:19 -0400	[thread overview]
Message-ID: <87mv8hu29o.fsf@kyleam.com> (raw)
In-Reply-To: <87h8yq9fuv.fsf@gmx.us>

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

      parent reply	other threads:[~2017-07-06 13:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-06  7:36 git question Rasmus
2017-07-06 11:58 ` Kaushal Modi
2017-07-06 13:24 ` Kyle Meyer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mv8hu29o.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).