[PATCH] gcc-changelog: support merge commits in git_update_version

[Jakub Jelinek]

On Thu, Jun 18, 2020 at 02:16:32PM +0200, Martin Liška wrote:
> The patch addresses need to generate ChangeLog for a vendor branch
> (redhat/gcc-10-branch) that can contain merge commits.
> 
> Tested on c518050989be3a224a04a8b33d73f37a16c30fbb and current active branches.
> Jakub: Can you please test it?

Works for me, LGTM, thanks.

> contrib/ChangeLog:
> 
> 	* gcc-changelog/git_update_version.py: Support merge commits
> 	and walk only on the branch that is being merged and generate
> 	missing ChangeLog entries.

	Jakub