git merge

what documentation tells you ...

What really happens in real life ...

Sources:

• http://stackoverflow.com/questions/9069061/what-is-the-difference-between-git-merge-and-git-merge-no-ff
• http://stackoverflow.com/questions/24800387/mass-deleting-local-branches-that-has-been-rebased-and-merged