git-restart 0.0.11.pre.dev → 0.0.12.dev

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git-restart/runner.rb +1 -0
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1a0602539b39f373497f2c7f0c83cd68babd3864
4
- data.tar.gz: 760387660b687fb183e2de28c72a8631fcd190d6
3
+ metadata.gz: 377548d63cced396aa7def11fb7db9983a4794e3
4
+ data.tar.gz: 0b0126bef493e96f947362cc4934c682de030a18
5
5
  SHA512:
6
- metadata.gz: 4c0cb6c02b073a56c0a4ca364756f0043701497a6f028d247cc5ffcc6b8dd5d576d302b5d775ad273811a7078e0a11e05687c64f88f4fe09c40da2e631f7a7cb
7
- data.tar.gz: f58686e48ac26a080bf7d3a7a42a445f17f2d2b98491ab256684a23e6689566f2099aa492a87aec0e776d73d158c6165230338f24224055cc972afae6b53b4e9
6
+ metadata.gz: 536ebb07fbe75db5ea57eb83c4bf1cc7740b41876e1c01dc193da987149f63aa8b784f73525647617b31736e7d6b80f9b86ace1cff5bd3e781e9302edc1d2fbe
7
+ data.tar.gz: ca3740f546f44ab6f011ceaf6479772dc27e425795226abbd3a0001c668e070aa794af635a0fbf6c70c3ddda344a4531540e24a1c0d9003f5603b21e9e0e5f67
data/lib/git-restart/runner.rb CHANGED
@@ -166,6 +166,7 @@ module GitRestart
166
166
  else
167
167
  _stop_triggered_tasks();
168
168
  end
169
+ @git.reset_hard();
169
170
  @git.checkout(branch);
170
171
  @git.merge("origin/#{branch}");
171
172
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-restart
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11.pre.dev
4
+ version: 0.0.12.dev
5
5
  platform: ruby
6
6
  authors:
7
7
  - Xasin