git add -p alias, vim surrounds tweaks