cherry pick git ignore and converter