Git Merge No Fast Forward Vs Squash