Fast-forward merge
A merge where the current branch has nothing the other lacks, so Git simply moves the branch forward without creating a merge commit. --no-ff forces a merge commit.
See it in context
Git and GitHub for mainframe developers: Branches, pull requests, reviews and conflicts