Improved all git dialogs

Work in progress on #2248

review: @gaurave

This fixes a bug ?