From: Bruno Haible <bruno@clisp.org>
To: Pedro Alves <palves@redhat.com>
Cc: bug-gnulib@gnu.org
Subject: Re: ChangeLog entries
Date: Tue, 22 Nov 2016 00:34:09 +0100 [thread overview]
Message-ID: <3612046.UvluEMGxo1@linuix.haible.de> (raw)
In-Reply-To: <669d9dd4-6794-f900-1ff8-64577b961843@redhat.com>
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
next prev parent reply other threads:[~2016-11-21 23:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-12 16:22 [PATCH] Avoid having GNULIB_NAMESPACE::func always inject references to rpl_func Pedro Alves
2016-11-12 17:30 ` Paul Eggert
2016-11-14 18:16 ` [PATCH] Fix real-floating argument functions in C++ mode Pedro Alves
2016-11-14 21:19 ` Pedro Alves
2016-11-14 23:08 ` Pedro Alves
2016-11-15 17:17 ` Paul Eggert
2016-11-20 12:26 ` [PATCH] Avoid having GNULIB_NAMESPACE::func always inject references to rpl_func Bruno Haible
2016-11-21 20:24 ` Pedro Alves
2016-11-21 23:27 ` Bruno Haible
2016-11-21 23:33 ` Pedro Alves
2016-11-21 23:34 ` Bruno Haible [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-28 7:08 Add gl_list_remove_last to list/xlist Marc Nieper-Wißkirchen
2020-10-10 14:06 ` stack module Bruno Haible
2020-10-10 14:35 ` Marc Nieper-Wißkirchen
2020-10-10 15:10 ` ChangeLog entries Bruno Haible
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3612046.UvluEMGxo1@linuix.haible.de \
--to=bruno@clisp.org \
--cc=bug-gnulib@gnu.org \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).