Git Pull Fast Forward Or Merge