fix wstool#25: no rebase after switching branches on update
Merge pull request #94 from vcstools/tkruse-wstoo25-no-ff-after-switch

fix wstool#25: no rebase after switching branches on update