git: automatic rebasing in master branch is not so nice after all