Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[David Engster]

Lars Ingebrigtsen writes:
> David Engster <address@hidden> 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