https://gcc.gnu.org/g:cf57f401ab8f44585c443d40aba5e360f89263db
commit cf57f401ab8f44585c443d40aba5e360f89263db
Author: Tobias Burnus <tbur...@baylibre.com>
Date: Thu May 22 17:10:44 2025 +0200
ChangeLog.omp bump
Diff:
---
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 024f5baf2eea..3158ef2eaad6 100644
--- a/contrib/ChangeLog.omp
+++ b/contrib/ChangeLog.omp
@@ -1,3 +1,10 @@
+2025-05-22 Tobias Burnus <tbur...@baylibre.com>
+
+ * 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 <tbur...@baylibre.com>
* gcc-changelog/git_repository.py (parse_git_revisions): Optional
diff --git a/gcc/DATESTAMP.omp b/gcc/DATESTAMP.omp
index e01bdfb865b5..7a7061068fcc 100644
--- a/gcc/DATESTAMP.omp
+++ b/gcc/DATESTAMP.omp
@@ -1 +1 @@
-20250516
+20250522
