commit Gaurav's pull PR

This land's Gaurav's pull request (#1200). The dialog is removed - it's just a context menu item now w/o any options. This CL also fixes several issues found while testing push and pull. Generally checked mode errors.

@gaurave, @dinhviethoa