git: revert to regular diff format, dfw/dfcw for word; zsh: :q aliased to exit. hope that doesn't cause any problems