[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ChangeLog entries
From: |
Bruno Haible |
Subject: |
Re: ChangeLog entries |
Date: |
Tue, 22 Nov 2016 00:34:09 +0100 |
User-agent: |
KMail/4.8.5 (Linux/3.8.0-44-generic; KDE/4.8.5; x86_64; ; ) |
Pedro Alves wrote:
> > I added ChangeLog entries for your two patches from 2016-11-12
> > (that Paul committed).
>
> Thanks! Should I assume you're all using git-merge-changelog and
Yes, we are all using the git-merge-changelog. It handles about 60% of
the ChangeLog entry conflicts correctly. (A couple of years ago, it
handled 95% of such conflicts correctly. I guess something in the git
internals has changed...)
> include ChangeLog changes in the diff as well as in the
> commit log?
Yes, this is how we all do it when we commit a patch.
When a contributor sends in a patch, the person who pushes it on behalf
of the author takes care of doing the right thing.
Many of us also use vc-dwim: It makes it less tedious to create the detailed
ChangeLog entry.
Bruno
Re: [PATCH] Avoid having GNULIB_NAMESPACE::func always inject references to rpl_func, Bruno Haible, 2016/11/20