From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411) Date: Sun, 01 May 2016 19:18:45 +0200 Message-ID: <874mahpuh6.fsf@gnus.org> References: <20160501152515.31964.66193@vcs.savannah.gnu.org> <87shy1pz0l.fsf@gnus.org> <83twihn5mx.fsf@gnu.org> <87eg9lpw80.fsf@gnus.org> <87a8k9pvtb.fsf@gnus.org> <8737q13dli.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1462123186 513 80.91.229.3 (1 May 2016 17:19:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 May 2016 17:19:46 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 01 19:19:37 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1awv1s-0004zs-SI for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 19:19:37 +0200 Original-Received: from localhost ([::1]:33730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv1p-0000D8-2T for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 13:19:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv1V-0008SN-BS for emacs-devel@gnu.org; Sun, 01 May 2016 13:19:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awv1J-0002Ic-HR for emacs-devel@gnu.org; Sun, 01 May 2016 13:19:07 -0400 Original-Received: from hermes.netfonds.no ([80.91.224.195]:55441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv1J-0002Eq-B5; Sun, 01 May 2016 13:19:01 -0400 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1awv13-0000VK-MZ; Sun, 01 May 2016 19:18:47 +0200 In-Reply-To: <8737q13dli.fsf@engster.org> (David Engster's message of "Sun, 01 May 2016 19:14:17 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 80.91.224.195 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:203495 Archived-At: David Engster writes: > Lars Ingebrigtsen writes: >> If the latter, is there an easy way to add the string "backport:" to >> every commit without doing it manually? > > FWIW, gitmerge.el should be able to detect cherry-picks through git's > "cherry mark", so putting in an additional string to the commit message > shouldn't be necessary. You only need to do that if you somehow modified > the patch during cherry-picking (by resolving a conflict, for instance). Oh, great. Then I can just do a cherry-pick -x, then, on the list of doc fixes that apply without any conflicts. That seems to be... uhm... 65-ish... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no