spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-30334
This commit is contained in:
Stephane Nicoll
2022-03-20 08:50:14 +01:00
parent f05c19a40a 1cfebc0d39
commit 0233dc035f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
git/hooks/forward-merge
+1 -1
View File
@@ -18,7 +18,7 @@ class ForwardMerge
end
def find_forward_merges(message_file)
$log.debug "Searching for for forward merge"
$log.debug "Searching for forward merge"
rev=`git rev-parse -q --verify MERGE_HEAD`.strip
$log.debug "Found #{rev} from git rev-parse"
return nil unless rev