40fd71bc05
Switch master branch to 2.5.x
5 years ago
e5ec6dfef0
Find nearest milestone for forward merge with .x pattern
...
Fixes gh-22350
6 years ago
97d4613fba
Refine prepare-forward-merge to detect master
6 years ago
c8e966002a
Fixup prepare-forward-merge for master
...
Fix the regex so that merges to master are supported.
6 years ago
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
6 years ago
39caf45155
Allow forward merge to work with .x patterns
...
Closes gh-21687
6 years ago
4a6e08c817
Add logging to forward-merge script
...
Add some logging to aid with development.
6 years ago
b6474f2ca1
Remove accidentally committed hook file
6 years ago
ffbb23bc6d
Always use credentials in forward merge script
...
Closes gh-17257
7 years ago
ef09ee5dea
Add new line when rewriting git message
...
Update the forward merge script to add an additional new line when
rewiring the commit message. Prior this this commit, if an additional
line immediately followed the "Fixes ... in ..." pattern it would be
appended to the end of the rewritten fixes line.
Closes gh-16861
7 years ago
95149cd7cb
Make it easier to identify issues created for forward ports
...
Closes gh-16566
7 years ago
7175b80669
Output information about issue created for forward merge
...
See gh-16458
7 years ago
58c9412c09
Add forward merge issue creation hook
...
Closes gh-16458
7 years ago
Stephane Nicoll
Scott Frederick
Phillip Webb
Phillip Webb
Andy Wilkinson