Avoiding local merge commit when git pulling