[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ChangeLog entries
|
From: |
Bruno Haible |
|
Subject: |
Re: ChangeLog entries |
|
Date: |
Sat, 10 Oct 2020 17:10:57 +0200 |
|
User-agent: |
KMail/5.1.3 (Linux/4.4.0-189-generic; KDE/5.18.0; x86_64; ; ) |
Hi Marc,
> (Do I have to
> do something about the ChangeLog entry or will it be auto-generated
> from my Git commit message?)
The ChangeLog entries are not auto-generated, no. We want the ChangeLog
entries to be essentially in sync with the git commits. This means, you
typically prepare the ChangeLog entry and reuse it for the git commit.
Or you prepare a git commit message (with line width <= 72) and use
it in the ChangeLog entry.
To avoid conflicts in ChangeLog during "git pull", I recomment to use the
git-merge-changelog program (see the comments in lib/git-merge-changelog.c).
Bruno