Merging and pulling from git as you were used to

Okay, we've been using git pull for a long time, and also for a long time we have been receiving a warning telling us that the behavior was going to change and the time has come.

But if you are like me you are used to the old times. And no worries you can go back in time and still have the same behavior.

git pull --no-ff

And

git merge --no-ff

You can also make it as default but I don't recommend that :)