Commit Graph

5 Commits

Author SHA1 Message Date
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename
See gh-26248
2021-04-27 11:56:10 +01:00
Stephane Nicoll 85d0f95f7a Start work on Spring Boot 2.5
Closes gh-24491
2020-12-14 14:35:37 +01:00
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
2020-06-05 15:36:09 -07:00
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
2020-06-04 20:10:09 -07:00