git merge --ff-only [target-branch]