Add cherry pick alias and up merge.renamelimit in config