[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
From: |
John Wiegley |
Subject: |
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 |
Date: |
Tue, 12 Jan 2016 09:11:21 -0800 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Glenn Morris <address@hidden> writes:
> In general, almost every non-trivial "skip" in this merge looks wrong to me.
Here is what was skipped:
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?
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
signature.asc
Description: PGP signature
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25,
John Wiegley <=