Skip to content

Commit

Permalink
Added option for git merge --no-ff cs
Browse files Browse the repository at this point in the history
  • Loading branch information
ziobron authored Feb 4, 2022
1 parent 8863802 commit 6712c5e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/scripts/history-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pattern ${FILE} "Pushed to the remote repo" "git(\s+)push(\s+)-u(\s+)origin(\s+)
pattern ${FILE} "Branch 'cs' created" "git(\s+)(branch|checkout(\s+)-b)(\s+)cs"
pattern ${FILE} "HEAD moved to \"Initial commit\"" "git(\s+)reset(\s+)|git(\s+)rebase(\s+)-i"
pattern ${FILE} "Branch 'cs' pushed" "git(\s+)push(\s+)origin(\s+)cs"
pattern ${FILE} "Branch 'cs' merged into 'master'" "git(\s+)merge(\s+)cs"
pattern ${FILE} "Branch 'cs' merged into 'master'" "git(\s+)merge(\s+)(.*)?cs"
echo

summary

0 comments on commit 6712c5e

Please sign in to comment.