Merge with a message

4c137ed3 · Lin Jen-Shin · 44b91aca · 4c137ed3
Commit 4c137ed3 authored Jul 03, 2018 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

scripts/ee_specific_check/ee_specific_check.rb scripts/ee_specific_check/ee_specific_check.rb +1 -1

No files found.
--- a/scripts/ee_specific_check/ee_specific_check.rb
+++ b/scripts/ee_specific_check/ee_specific_check.rb
@@ -90,7 +90,7 @@ module EESpecificCheck
  def find_forward_ce_head(ce_merge_base, ce_fetch_head)
    say("Performing merge with CE master for CE branch #{ce_fetch_head}")
    with_detached_head(ce_fetch_head) do
-      run_git_command("merge #{ce_merge_base} -s recursive -X patience")
+      run_git_command("merge #{ce_merge_base} -s recursive -X patience -m 'ee-specific-auto-merge'")
      status = git_status