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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0602539b39f373497f2c7f0c83cd68babd3864
-  data.tar.gz: 760387660b687fb183e2de28c72a8631fcd190d6
+  metadata.gz: 377548d63cced396aa7def11fb7db9983a4794e3
+  data.tar.gz: 0b0126bef493e96f947362cc4934c682de030a18
 SHA512:
-  metadata.gz: 4c0cb6c02b073a56c0a4ca364756f0043701497a6f028d247cc5ffcc6b8dd5d576d302b5d775ad273811a7078e0a11e05687c64f88f4fe09c40da2e631f7a7cb
-  data.tar.gz: f58686e48ac26a080bf7d3a7a42a445f17f2d2b98491ab256684a23e6689566f2099aa492a87aec0e776d73d158c6165230338f24224055cc972afae6b53b4e9
+  metadata.gz: 536ebb07fbe75db5ea57eb83c4bf1cc7740b41876e1c01dc193da987149f63aa8b784f73525647617b31736e7d6b80f9b86ace1cff5bd3e781e9302edc1d2fbe
+  data.tar.gz: ca3740f546f44ab6f011ceaf6479772dc27e425795226abbd3a0001c668e070aa794af635a0fbf6c70c3ddda344a4531540e24a1c0d9003f5603b21e9e0e5f67

data/lib/git-restart/runner.rb

@@ -166,6 +166,7 @@ module GitRestart
 			else
 				_stop_triggered_tasks();
 			end
+			@git.reset_hard();
 			@git.checkout(branch);
 			@git.merge("origin/#{branch}");
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-restart
 version: !ruby/object:Gem::Version
-  version: 0.0.11.pre.dev
+  version: 0.0.12.dev
 platform: ruby
 authors:
 - Xasin