Re: Freeze is almost here

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Sat, 14 Nov 2015 15:37:51 +0100
> 
> But when you later *merge* the branch from which you cherry-picked (like
> we did with 'master'), git of course sees the cherry-picked commits as
> merged, and hence does not check the patch-id later as well (most likely
> because that would be slow). At least that's how I understand it.

I hope we won't merge from master to emacs-25.

> > Also, what about the effect of the "cherry-pick -x" switch, does
> > affect gitmerge in any way?
> 
> We could of course add "cherry picked" to the gitmerge-skip-regexp, but
> otherwise, the '-x' has no affect on how git itself detects
> cherry-picks.

If detection of cherry-picks is reliable, I see no need to add that to
gitmerge-skip-regexp.

Thanks.