multi_repo 0.1.2 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 569dd39745ef1ab573d95ef3c1724aed8c96afb4fddc72d09c7f24774acce7f8
4
- data.tar.gz: 9272ee6b4996a0f28a5d5af60c9ed201845306cde7f4ceafb67aec473417733d
3
+ metadata.gz: b2f8e962cb396736c017c1dd641f20503dde65b5dadaf20d38bb98a1811d3f4c
4
+ data.tar.gz: da90a0d13d0e8c999e80a40979627470f64551d55b89f2a08b629040e07130ef
5
5
  SHA512:
6
- metadata.gz: 56011154b9371332679c7d46a78c0bf7c125acce711dcd5e36ecb0c2960c96b2136b103b51fc675a7b5bc6dec4d352794c7f4b77cf4816ea032e26e38d1cd988
7
- data.tar.gz: d18605c473b2bc80bf3805bfa53048eae473f99488843b863fe697443df30a2239436021cd2901f038982c01dadc71170b361f99ee034890bdd6bc0d22ca0af1
6
+ metadata.gz: ffa32e47da1036891d73af604b0ddc1bd9f02d1ab053c1b84c6ba4604ca52ef6c842cb214636020ed1f79e2d6a4d50bc47ffdbd40e22e787a9e2eddce659284f
7
+ data.tar.gz: '055905a0eb895e8cfd4377d5f73018465911d3a3a72e88e052acae945619f000b05cfb8264a105b1fada75087c96343ea0aafe860221b37eaee995007418b77a'
@@ -164,7 +164,7 @@ module MultiRepo::Helpers
164
164
 
165
165
  success =
166
166
  system("git checkout -B #{dest_name} #{start_point}") &&
167
- system("git pull --rebase=merges #{source_remote} #{source_name}") &&
167
+ system("git pull --no-rebase #{source_remote} #{source_name}") &&
168
168
  system("git push -f #{dest_remote} #{dest_name}")
169
169
 
170
170
  if backup_remote_defined?
@@ -1,3 +1,3 @@
1
1
  module MultiRepo
2
- VERSION = "0.1.2"
2
+ VERSION = "0.2.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: multi_repo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ManageIQ Authors
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-06-07 00:00:00.000000000 Z
11
+ date: 2023-07-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport