ui.rb in pt-flow-0.1.5

- old
+ new

@@ -38,18 +38,16 @@
     task = PivotalTracker::Story.find(branch, @project.id)
     deliver_task(task)
   end
 
   def cleanup
-    # Run from master
-    `git checkout master`
-
-    # Remove local fully merged branches
-    `git branch --merged master | grep -v 'master$' | xargs git branch -d`
-
     # Update our list of remotes
     `git fetch`
     `git remote prune origin`
+
+    # Remove local branches fully merged with origin/master
+    `git branch --merged origin/master | grep -v 'master$' | xargs git branch -d`
+
     congrats('All clean!')
   end
 
   def help
     if ARGV[0] && ARGV[0] != 'help'