Try using the --no-ff flag for adding a merge, but not doing a fast forward commit.

git merge --no-ff <feature-branch>

These are essential when the branch you are merging into has no current commits of its own, so git fast forwards a merge with a commit.