aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Burnus <tburnus@baylibre.com>2025-05-22 17:10:44 +0200
committerTobias Burnus <tburnus@baylibre.com>2025-05-22 17:10:44 +0200
commitcf57f401ab8f44585c443d40aba5e360f89263db (patch)
treeead8e0344c07ff1e4c2e3e74692784ba2ab593da
parentcc7f48e65b9aadb885461dea201d6028cc008ea1 (diff)
downloadgcc-cf57f401ab8f44585c443d40aba5e360f89263db.zip
gcc-cf57f401ab8f44585c443d40aba5e360f89263db.tar.gz
gcc-cf57f401ab8f44585c443d40aba5e360f89263db.tar.bz2
ChangeLog.omp bump
-rw-r--r--contrib/ChangeLog.omp7
-rw-r--r--gcc/DATESTAMP.omp2
2 files changed, 8 insertions, 1 deletions
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 <tburnus@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 <tburnus@baylibre.com>
* 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