Use xscreensaver (to lock screen)
Set git's push.default setting to 'simple'