Skip to content

Commit c72dd7d

Browse files
committed
Fix typo in forward-merge script
1 parent 81a5794 commit c72dd7d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git/hooks/prepare-forward-merge

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def rewrite_message(message_file, fixed)
3838
if from_branch.include? "/"
3939
from_branch = from_branch.partition("/").last
4040
end
41-
to_brach = match[2]
41+
to_branch = match[2]
4242
$log.debug "Rewriting merge message"
43-
line = "Merge branch '#{from_branch}'" + (to_brach ? " into #{to_brach}\n" : "\n")
43+
line = "Merge branch '#{from_branch}'" + (to_branch ? " into #{to_branch}\n" : "\n")
4444
end
4545
if fixed and line.start_with?("#")
4646
$log.debug "Adding fixed"

0 commit comments

Comments
 (0)