Git Pull Without Merge Commit