From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster 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:21:40 +0200 Message-ID: <87y47t1yor.fsf@engster.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> <874mahpuh6.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1462123360 2986 80.91.229.3 (1 May 2016 17:22:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 May 2016 17:22:40 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 01 19:22:31 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 1awv4h-0006NB-9I for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 19:22:31 +0200 Original-Received: from localhost ([::1]:33736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv4d-0003ii-Ca for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 13:22:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv4K-0003TU-JX for emacs-devel@gnu.org; Sun, 01 May 2016 13:22:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awv49-00036b-2u for emacs-devel@gnu.org; Sun, 01 May 2016 13:22:03 -0400 Original-Received: from randomsample.de ([5.45.97.173]:54704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awv47-000350-QC; Sun, 01 May 2016 13:21:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=cb1Po3NXT8pu4Qoz8aDezgDHLgm6ZalDhMh+CWZJURU=; b=VCB9EBy6UcIeMW4ikDOIBen0JbSJe3F45N9Mr1a0A6KS1F3TAPnPXfIMW6idwrCXzM7JS88PzXFZhyWc6QBTXU9+A/f+qpanRAi6pH+2UcbH4HBD+qobs4c5oQm9Jgm7; Original-Received: from ip4d168166.dynamic.kabel-deutschland.de ([77.22.129.102] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1awv3u-00066y-8e; Sun, 01 May 2016 19:21:42 +0200 In-Reply-To: <874mahpuh6.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 01 May 2016 19:18:45 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:203496 Archived-At: Lars Ingebrigtsen writes: > 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... 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. -David