From cf57f401ab8f44585c443d40aba5e360f89263db Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 22 May 2025 17:10:44 +0200 Subject: ChangeLog.omp bump --- contrib/ChangeLog.omp | 7 +++++++ gcc/DATESTAMP.omp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/ChangeLog.omp b/contrib/ChangeLog.omp index 024f5ba..3158ef2 100644 --- a/contrib/ChangeLog.omp +++ b/contrib/ChangeLog.omp @@ -1,3 +1,10 @@ +2025-05-22 Tobias Burnus + + * gcc-changelog/git_update_version.py (update_current_branch): Fix + handling of merges. + * gcc-changelog/git_repository.py (parse_git_revisions): Skip over + merge commits for merges from exclude branch. + 2025-05-15 Tobias Burnus * gcc-changelog/git_repository.py (parse_git_revisions): Optional diff --git a/gcc/DATESTAMP.omp b/gcc/DATESTAMP.omp index e01bdfb..7a70610 100644 --- a/gcc/DATESTAMP.omp +++ b/gcc/DATESTAMP.omp @@ -1 +1 @@ -20250516 +20250522 -- cgit v1.1