Enlarged my maximum directory path length (in the prompt-line) to 40 chars. Seems a better compromise.
Don't keep host-specific aliases under git