Skip to content

S
spring-boot
Commit 9b95ab26 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.2.x' into 2.3.x

parents bbb57428 97d4613f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
git/hooks/prepare-forward-merge
View file @ 9b95ab26
...@@ -25,7 +25,7 @@ def get_fixed_issues() ...@@ -25,7 +25,7 @@ def get_fixed_issues()
end end
def rewrite_message(message_file, fixed) def rewrite_message(message_file, fixed)
current_branch = `git rev-parse --abbrev-ref HEAD` current_branch = `git rev-parse --abbrev-ref HEAD`.strip
if current_branch == "master" if current_branch == "master"
current_branch = $master_branch current_branch = $master_branch
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment