From: Lars Ingebrigtsen <larsi@gnus.org>
To: David Engster <deng@randomsample.de>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)
Date: Sun, 01 May 2016 19:47:03 +0200 [thread overview]
Message-ID: <87oa8poelk.fsf@gnus.org> (raw)
In-Reply-To: <87y47t1yor.fsf@engster.org> (David Engster's message of "Sun, 01 May 2016 19:21:40 +0200")
David Engster <deng@randomsample.de> writes:
> Even if you have a conflict, the '-x' will already append "cherry picked
> from commit...", which we should probably just add to
> gitmerge-skip-regexp anyway.
Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is
without conflicts, and emacs-25 still builds. :-)
I just wanted to triple-check before pushing: Is this the way to do it?
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2016-05-01 17:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160501152515.31964.66193@vcs.savannah.gnu.org>
[not found] ` <E1awtFD-0008KC-DM@vcs.savannah.gnu.org>
2016-05-01 15:40 ` emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411) Lars Ingebrigtsen
2016-05-01 15:42 ` Lars Ingebrigtsen
2016-05-01 15:45 ` Eli Zaretskii
2016-05-01 16:41 ` Lars Ingebrigtsen
2016-05-01 16:49 ` Lars Ingebrigtsen
2016-05-01 17:14 ` David Engster
2016-05-01 17:18 ` Lars Ingebrigtsen
2016-05-01 17:21 ` David Engster
2016-05-01 17:47 ` Lars Ingebrigtsen [this message]
2016-05-01 18:03 ` Eli Zaretskii
2016-05-01 18:04 ` Lars Ingebrigtsen
2016-05-01 18:15 ` Eli Zaretskii
2016-05-01 18:19 ` Lars Ingebrigtsen
2016-05-01 19:25 ` David Engster
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87oa8poelk.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=deng@randomsample.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@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.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).