Paul Eggert <eggert@cs.ucla.edu> writes:

> On 02/01/2016 12:43 AM, Nicolas Petton wrote:
>> How should I generate the changelog files next time?  IIUC I need to
>> make sure no commit happens while doing so, so I won't have to rebase.
>>
>
> You might try something like this:
>
> git checkout emacs-25
> git pull
> git diff # This should output nothing.
> make change-history
> git diff HEAD^ # This should output what you want.
> git push

I'll do that, and make sure I don't rebase.

Nico