Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alexander Kanavin
waffle
Commits
34bd1e85
Commit
34bd1e85
authored
Nov 09, 2014
by
Chad Versace
Browse files
waffle-merge: Insert missing space in commit messages
Fix "Mergebranch" -> "Merge branch". Regex had a bug.
parent
ff8703f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
bin/waffle-merge
View file @
34bd1e85
...
...
@@ -102,7 +102,7 @@ function wfl_cleanup_merge_msg {
for
p
in
"
${
prefixes_to_trim
[@]
}
"
;
do
# Trim prefix off of incoming merge refname.
sed_cmd+
=(
-e
"s|^(Merge
\|\*
)
(branch
\|
tag
\|
)'
$p
/([^']+)'|
\1\2
'
\3
'|"
)
sed_cmd+
=(
-e
"s|^(Merge
\|\*
)
(branch
\|
tag
\|
)'
$p
/([^']+)'|
\1\2
'
\3
'|"
)
# Trim prefix off of HEAD's refname.
sed_cmd+
=(
-e
"s|^(Merge .* into )
$p
/|
\1
|"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment