git-fast-import(1): reorganise options