Re: make change-history on non-master branches

[Eli Zaretskii]

> From: Glenn Morris <address@hidden>
> Date: Sat, 14 Nov 2015 21:15:57 -0500
> Cc: address@hidden
> 
> And the resulting ChangeLog.2 entries (and more importantly, any
> corrections) will have to be merged to master, just like in the old days?

Maybe I'm missing something, but why do we have to merge it?  Won't
"make change-history" create on each branch the file that branch
wants?

If we can avoid merging, we could teach gitmerge.el skip that file.