git_pr 0.0.10.pre0 → 0.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/git_pr/merge.rb +2 -2
- data/lib/git_pr/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 611f91c84dcbbe1eb2b14e5a7020075590136f0e
|
|
4
|
+
data.tar.gz: 847a76363d2fac51218a44fa8e567564a6301d07
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6a2281f0690b4a54d4018599918fa0214b593cff877346d302b5280607a34b680f0439518a58c7f8ef47604f5f50da5ccbebea431e439e24ca2ddd8752783616
|
|
7
|
+
data.tar.gz: 7e6833a7e78a47c6a34f983775e80480fc990205158794c52fb5ad253a8d11b9d5b25eaee13e6651b375512649e6a0d2df243609498d1a4bc9628e2743b4ebc9
|
data/lib/git_pr/merge.rb
CHANGED
|
@@ -94,12 +94,12 @@ module GitPr
|
|
|
94
94
|
puts "Unable to automatically rebase #{remote_source_branch} on top of #{target_branch}. Rebase manually and push before trying again.".red
|
|
95
95
|
puts "Run: " + "git checkout #{source_branch}".yellow
|
|
96
96
|
puts " " + "git rebase #{target_branch}".yellow + " and fix up any conflicts."
|
|
97
|
-
puts " " + "git push -
|
|
97
|
+
puts " " + "git push --force-with-lease".yellow
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
# Force push the rebased branch to the source remote.
|
|
101
101
|
puts "Pushing changes from '#{rebase_branch}' to '#{source_remote.name}/#{source_branch}'"
|
|
102
|
-
GitPr.run_command "git push -
|
|
102
|
+
GitPr.run_command "git push --force-with-lease #{source_remote.name} HEAD:#{source_branch} 2>&1"
|
|
103
103
|
|
|
104
104
|
# Merge the source branch into the target. Use --no-ff so that an explicit
|
|
105
105
|
# merge commit is created.
|
data/lib/git_pr/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git_pr
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.10
|
|
4
|
+
version: 0.0.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Brian Sharon
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-10-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colorize
|
|
@@ -159,9 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
159
159
|
version: '0'
|
|
160
160
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
161
161
|
requirements:
|
|
162
|
-
- - '
|
|
162
|
+
- - '>='
|
|
163
163
|
- !ruby/object:Gem::Version
|
|
164
|
-
version:
|
|
164
|
+
version: '0'
|
|
165
165
|
requirements: []
|
|
166
166
|
rubyforge_project:
|
|
167
167
|
rubygems_version: 2.0.14
|