Fix git completion and prompt