Re: Freeze is almost here

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: Andreas Schwab <address@hidden>,  address@hidden,  address@hidden
> Date: Sat, 14 Nov 2015 09:45:10 +0100
> 
> >> ??? Just fast forward it.
> >
> > I didn't know how to do that (can you tell?).
> 
> By merging master into emacs-25. Git will do a fast-forward by default
> if it is possible (use --ff-only to abort otherwise).

Thanks, will do in the future.

> Regarding your 'Backport' messages in the cherry-picks: You only need to
> do that when there was a conflict. Otherwise, gitmerge.el should detect
> cherry-picks through the cherry-mark and automatically mark them as to
> be skipped. However, I realize now that I'm calling the wrong log
> command for that; I'll fix that over the weekend.

Thanks.

Please also consider whether we need some changes in gitmerge.el now
that we produce ChangeLog from the Git log.