Merge branch 'develop'

BigKeeper · Jun 19, 2019 · ad45a15 · ad45a15
2 parents a210d60 + 768983c
commit ad45a15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/big_keeper/util/git_operator.rb b/lib/big_keeper/util/git_operator.rb
@@ -186,7 +186,7 @@ def check_remote_branch_diff(path, branch, compare_branch)
       compare_branch_commits = Array.new
       IO.popen("cd '#{path}';git log --left-right #{branch}...origin/#{compare_branch} --pretty=oneline") do |io|
         io.each do |line|
-          compare_branch_commits.push(line) unless (line.include? '>') && (line.include? "Merge branch \'#{branch}\' into \'#{compare_branch}\'")
+          compare_branch_commits.push(line) unless (line.include? '>') && (line.include? "Merge branch \'#{branch}\'")
         end
       end
       if compare_branch_commits.size > 0

diff --git a/lib/big_keeper/version.rb b/lib/big_keeper/version.rb
@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end