dev_flow 0.0.5 → 0.0.6
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.
- data/lib/dev_flow/girc.rb +6 -4
- data/lib/dev_flow/version.rb +1 -1
- metadata +2 -2
data/lib/dev_flow/girc.rb
CHANGED
|
@@ -137,15 +137,17 @@ module DevFlow
|
|
|
137
137
|
end
|
|
138
138
|
|
|
139
139
|
if branch == self.current_branch
|
|
140
|
-
info "
|
|
141
|
-
`#{@git} pull --rebase #{remote} #{branch}`
|
|
140
|
+
info "Pull from remote"
|
|
141
|
+
# `#{@git} pull --rebase #{remote} #{branch}`
|
|
142
|
+
`#{@git} pull #{remote} #{branch}`
|
|
142
143
|
else
|
|
143
144
|
info "Switch to branch #{branch}"
|
|
144
145
|
`#{@git} fetch #{remote}`
|
|
145
146
|
rslt = `#{@git} checkout #{branch}`
|
|
146
147
|
raise "Checkout failed: #{rslt}" unless $?.success?
|
|
147
|
-
info "Update
|
|
148
|
-
rslt = `#{@git} pull --rebase #{remote} #{branch}`
|
|
148
|
+
info "Update branch from remote"
|
|
149
|
+
# rslt = `#{@git} pull --rebase #{remote} #{branch}`
|
|
150
|
+
rslt = `#{@git} pull #{remote} #{branch}`
|
|
149
151
|
raise "Rebase pull for #{branch} failed: #{rslt}" unless $?.success?
|
|
150
152
|
info "Switch back to branch #{cb}"
|
|
151
153
|
`#{@git} checkout #{cb}`
|
data/lib/dev_flow/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dev_flow
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.6
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-03-
|
|
12
|
+
date: 2013-03-26 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: term-ansicolor
|