Re: EWW bugs should be fixed on emacs-25 branch

[Eli Zaretskii]

> From: David Kastrup <address@hidden>
> Cc: address@hidden,  address@hidden
> Date: Fri, 25 Dec 2015 09:26:46 +0100
> 
> Commits created with "git cherry-pick" are considered equivalent with
> the original for Git with regard to merge histories.  Whatever Git
> itself does for checking them in that manner should likely be part of
> the manual procedures for "merging back to master", possibly by using
> only commits mentioned in "git log --cherry-pick ...".
> 
> That way, we need not rely on manual additions to the commit message.

Actually, I was talking about what git-merge.el does.