Commit Graph

14 Commits (d284567a84879e5d376427be60ffc4fd5e71c6fd)

Author SHA1 Message Date
Andy Wilkinson 63abaa4cd2 Start working on 3.1.0 2 years ago
Moritz Halbritter 4d2b389248 Merge branch '2.7.x' 2 years ago
Moritz Halbritter c72dd7de1a Fix typo in forward-merge script 2 years ago
Johnny Lim 90589fd6d4 Polish
See gh-33384
2 years ago
Andy Wilkinson 430f033381 Create forward port issues for merges into main
This reverts commit 4e884b27f8.

Closes gh-31148
3 years ago
Andy Wilkinson 4e884b27f8 Don't create forward port issues for merges into main 3 years ago
Andy Wilkinson e06b0d97f7 Update main branch to start work on 3.0.x 3 years ago
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 3 years ago
dreis2211 9d344b1e18 Update some more references to 2.5.x
See gh-26861
3 years ago
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename
See gh-26248
4 years ago
Stephane Nicoll 85d0f95f7a Start work on Spring Boot 2.5
Closes gh-24491
4 years ago
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 5 years ago
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
5 years ago
Phillip Webb 10fdd65063 Add prepare-forward-merge script
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
5 years ago