X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;h=5364fcd381e179a09e681d59ad95745787e57063;hp=69644ddbc948976343f18ebc1b3f3c6633910ab9;hb=005e856ef0c36a43d6417539c28f6fd42dbaec56;hpb=22d38a5e650911a1fffde6188630369ed2d65735

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 69644ddb..5364fcd3 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -500,12 +500,22 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Ignore for now";
+            this.el.label = "Reset to remote";
 
             //listeners
             this.el.button_press_event.connect( () => {
-                   _this.el.hide();
-                    return false;
+              
+               
+               GitMonitor.gitmonitor.stop();
+               _this.repo.git({ "reset" , "--hard" });
+               _this.repo.loadStatus();
+               GitMonitor.gitmonitor.start();
+                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
+                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
+                Clones.singleton().reposStore.load();
+              
+               _this.el.hide();
+                return false;
             });
         }
 
@@ -529,14 +539,14 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Reset to remote";
+            this.el.label = "Pull updates";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
                
                GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "reset" , "--hard" });
+               _this.repo.git({ "pull" , "--all" });
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);