Update comment regarding update_branch

Could not find a way to prevent non-ff pulls, so resorted to rebasing
on top of the pull instead.
Merge branch 'release/1.0.1'