From: John Wiegley <jwiegley@gmail.com>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
Date: Mon, 18 Jan 2016 23:38:45 -0800 [thread overview]
Message-ID: <m2k2n6auii.fsf@newartisans.com> (raw)
In-Reply-To: <569538BA.9020208@cs.ucla.edu> (Paul Eggert's message of "Tue, 12 Jan 2016 09:32:42 -0800")
>>>>> Paul Eggert <eggert@cs.ucla.edu> writes:
> On 01/12/2016 09:11 AM, John Wiegley wrote:
> > 1 31a97ac Michael Albinus : Merge branch 'emacs-25' of git.sv.gnu.org:...
> > 2 e79b06e Paul Eggert : Avoid stdio in SIGINT handler
> > 3 5213ded Jens Lechtenboerger : Refactor mml-smime.el, mml1991.el, mml2015.el
> > 4 372d00a Glenn Morris : ; Auto-commit of loaddefs files.
> > 5 9825305 Paul Eggert : Merge from gnulib
> > 6 30f4a89 YAMAMOTO Mitsuharu : Move variables to inner loop, preparing for...
> >
> > I take it #1 and #4 are valid skips, but the other four should be
> > cherry-picked into master? Do we have a special command or annotation for
> > doing so?
>
> I don't think so, no. I would just install the patches into master. (It's not
> likely that anyone will want to backport them into emacs-25. :-)
Just a note that the four commits above have been cherry picked to master, and
another merge from emacs-25 has been performed.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
prev parent reply other threads:[~2016-01-19 7:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160112070839.6841.77764@vcs.savannah.gnu.org>
[not found] ` <E1aIt4Y-0001pf-Ns@vcs.savannah.gnu.org>
2016-01-12 9:48 ` master 2d7f4d9 12/15: ; Merge from origin/emacs-25 Michael Albinus
2016-01-12 15:50 ` Eli Zaretskii
2016-01-12 16:23 ` John Wiegley
[not found] ` <E1aIt4W-0001p0-Om@vcs.savannah.gnu.org>
2016-01-12 16:50 ` master 70f3e4e 08/15: " Glenn Morris
2016-01-12 17:03 ` John Wiegley
2016-01-12 17:09 ` Glenn Morris
2016-01-12 17:12 ` John Wiegley
2016-01-18 18:26 ` Glenn Morris
2016-01-18 19:27 ` Paul Eggert
2016-01-18 21:42 ` John Wiegley
2016-01-12 17:11 ` John Wiegley
2016-01-12 17:32 ` Paul Eggert
2016-01-14 23:15 ` Phillip Lord
2016-01-19 7:38 ` John Wiegley [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2k2n6auii.fsf@newartisans.com \
--to=jwiegley@gmail.com \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=johnw@gnu.org \
--cc=rgm@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.