git_pr 0.0.10.pre0 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96352a7f97c8bb195cbbde44c20660375472b0c7
-  data.tar.gz: 8e9ed2c28fd7a72fbdd67b3cd5732be53a2b7018
+  metadata.gz: 611f91c84dcbbe1eb2b14e5a7020075590136f0e
+  data.tar.gz: 847a76363d2fac51218a44fa8e567564a6301d07
 SHA512:
-  metadata.gz: 296a2109e85a169fcd6125fd62397eb05b9abd0b1eb716ba61913d64dfe4bae1bfb0a06262c8ff926ab2af24b1a8406191d16cf46e836373a60712906f6376a3
-  data.tar.gz: 3f3a0e4169ac01a16fc5e8eaa4f2b1e6254f812e5bb4ab7ecf6057f312d001f7255ae81a7711f057dd2abccde434def0e42a2c2dd9bb9c9f9a6ae375d899b5b8
+  metadata.gz: 6a2281f0690b4a54d4018599918fa0214b593cff877346d302b5280607a34b680f0439518a58c7f8ef47604f5f50da5ccbebea431e439e24ca2ddd8752783616
+  data.tar.gz: 7e6833a7e78a47c6a34f983775e80480fc990205158794c52fb5ad253a8d11b9d5b25eaee13e6651b375512649e6a0d2df243609498d1a4bc9628e2743b4ebc9

data/lib/git_pr/merge.rb

@@ -94,12 +94,12 @@ module GitPr
       puts "Unable to automatically rebase #{remote_source_branch} on top of #{target_branch}. Rebase manually and push before trying again.".red
       puts "Run: " + "git checkout #{source_branch}".yellow
       puts "     " + "git rebase #{target_branch}".yellow + " and fix up any conflicts."
-      puts "     " + "git push -f".yellow
+      puts "     " + "git push --force-with-lease".yellow
     }
 
     # Force push the rebased branch to the source remote.
     puts "Pushing changes from '#{rebase_branch}' to '#{source_remote.name}/#{source_branch}'"
-    GitPr.run_command "git push -f #{source_remote.name} HEAD:#{source_branch} 2>&1"
+    GitPr.run_command "git push --force-with-lease #{source_remote.name} HEAD:#{source_branch} 2>&1"
 
     # Merge the source branch into the target. Use --no-ff so that an explicit
     # merge commit is created.

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.10.pre0"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre0
+  version: 0.0.10
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -159,9 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14